diff --git a/toonz/sources/colorfx/rasterstyles.h b/toonz/sources/colorfx/rasterstyles.h index 6bb7490..797fd35 100644 --- a/toonz/sources/colorfx/rasterstyles.h +++ b/toonz/sources/colorfx/rasterstyles.h @@ -110,7 +110,7 @@ protected: //============================================================================= -class TBlendRasterStyle : public TAirbrushRasterStyle { +class TBlendRasterStyle final : public TAirbrushRasterStyle { public: TBlendRasterStyle(const TPixel32 &color, double blur) : TAirbrushRasterStyle(color, blur) {} @@ -132,7 +132,7 @@ private: //============================================================================= -class TNoColorRasterStyle : public TColorStyle, TRasterStyleFx { +class TNoColorRasterStyle final : public TColorStyle, TRasterStyleFx { public: TNoColorRasterStyle() {} TColorStyle *clone() const override { return new TNoColorRasterStyle(*this); } diff --git a/toonz/sources/colorfx/regionstyles.h b/toonz/sources/colorfx/regionstyles.h index 1f1f81d..e20d569 100644 --- a/toonz/sources/colorfx/regionstyles.h +++ b/toonz/sources/colorfx/regionstyles.h @@ -29,7 +29,7 @@ class TRandom; //============================================================ -class MovingModifier : public TOutlineStyle::RegionOutlineModifier { +class MovingModifier final : public TOutlineStyle::RegionOutlineModifier { TPointD m_move; public: @@ -51,7 +51,7 @@ public: //============================================================ -class MovingSolidColor : public TSolidColorStyle { +class MovingSolidColor final : public TSolidColorStyle { public: MovingSolidColor(const TPixel32 &color, const TPointD &move); @@ -84,7 +84,7 @@ protected: //============================================================ -class DVAPI ShadowStyle : public TSolidColorStyle { +class DVAPI ShadowStyle final : public TSolidColorStyle { TPointD m_shadowDirection; TPixel32 m_shadowColor; double m_density; @@ -140,7 +140,7 @@ private: //============================================================ -class DVAPI ShadowStyle2 : public TSolidColorStyle { +class DVAPI ShadowStyle2 final : public TSolidColorStyle { TPointD m_shadowDirection; TPixel32 m_shadowColor; double m_shadowLength; @@ -193,7 +193,7 @@ private: //============================================================ -class RubberModifier : public TOutlineStyle::RegionOutlineModifier { +class RubberModifier final : public TOutlineStyle::RegionOutlineModifier { double m_deform; public: @@ -212,7 +212,7 @@ public: //============================================================ -class DVAPI TRubberFillStyle : public TSolidColorStyle { +class DVAPI TRubberFillStyle final : public TSolidColorStyle { typedef std::vector QuadraticVector; typedef std::vector QuadraticPVector; @@ -253,7 +253,7 @@ private: //============================================================ -class DVAPI TPointShadowFillStyle : public TSolidColorStyle { +class DVAPI TPointShadowFillStyle final : public TSolidColorStyle { TPointD m_shadowDirection; TPixel32 m_shadowColor; double m_shadowSize; @@ -317,7 +317,7 @@ private: //============================================================ -class DVAPI TDottedFillStyle : public TSolidColorStyle { +class DVAPI TDottedFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor; double m_dotSize; double m_dotDist; @@ -372,7 +372,7 @@ private: //============================================================ -class DVAPI TCheckedFillStyle : public TSolidColorStyle { +class DVAPI TCheckedFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor; double m_HDist, m_HAngle; double m_VDist, m_VAngle, m_Thickness; @@ -429,7 +429,7 @@ protected: //============================================================ -class ArtisticModifier : public TOutlineStyle::RegionOutlineModifier { +class ArtisticModifier final : public TOutlineStyle::RegionOutlineModifier { TPointD m_move; double m_period; @@ -454,7 +454,7 @@ public: //============================================================ -class ArtisticSolidColor : public TSolidColorStyle { +class ArtisticSolidColor final : public TSolidColorStyle { public: ArtisticSolidColor(const TPixel32 &color, const TPointD &move, double period); @@ -487,7 +487,7 @@ protected: //============================================================ -class DVAPI TChalkFillStyle : public TSolidColorStyle { +class DVAPI TChalkFillStyle final : public TSolidColorStyle { TPixel32 m_color0; double m_density, m_size; @@ -538,7 +538,7 @@ protected: //============================================================ -class DVAPI TChessFillStyle : public TSolidColorStyle { +class DVAPI TChessFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor; double m_HDist, m_VDist, m_Angle; @@ -589,7 +589,7 @@ private: //============================================================ -class DVAPI TStripeFillStyle : public TSolidColorStyle { +class DVAPI TStripeFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor; double m_Dist, m_Angle, m_Thickness; @@ -644,7 +644,7 @@ private: //============================================================ -class DVAPI TLinGradFillStyle : public TSolidColorStyle { +class DVAPI TLinGradFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor; double m_Angle; double m_XPos, m_YPos, m_Size; @@ -699,7 +699,7 @@ private: //============================================================ -class DVAPI TRadGradFillStyle : public TSolidColorStyle { +class DVAPI TRadGradFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor; double m_Radius; double m_XPos, m_YPos; @@ -747,7 +747,7 @@ protected: //============================================================ -class DVAPI TCircleStripeFillStyle : public TSolidColorStyle { +class DVAPI TCircleStripeFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor; double m_XPos, m_YPos; double m_Dist, m_Thickness; @@ -802,7 +802,7 @@ private: //============================================================ -class DVAPI TMosaicFillStyle : public TSolidColorStyle { +class DVAPI TMosaicFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor[4]; double m_size; double m_deform; @@ -859,7 +859,7 @@ private: //============================================================ -class DVAPI TPatchFillStyle : public TSolidColorStyle { +class DVAPI TPatchFillStyle final : public TSolidColorStyle { TPixel32 m_pointColor[6]; double m_size; double m_deform; diff --git a/toonz/sources/colorfx/strokestyles.cpp b/toonz/sources/colorfx/strokestyles.cpp index 09755e6..bbf7790 100644 --- a/toonz/sources/colorfx/strokestyles.cpp +++ b/toonz/sources/colorfx/strokestyles.cpp @@ -28,7 +28,7 @@ using namespace std; namespace { template -class TOptimizedStrokePropT : public TStrokeProp { +class TOptimizedStrokePropT final : public TStrokeProp { protected: double m_pixelSize; diff --git a/toonz/sources/colorfx/strokestyles.h b/toonz/sources/colorfx/strokestyles.h index 446e957..c604369 100644 --- a/toonz/sources/colorfx/strokestyles.h +++ b/toonz/sources/colorfx/strokestyles.h @@ -71,7 +71,7 @@ public: //------------------------------------------------------------------- -class TFurStrokeStyle : public TOptimizedStrokeStyleT { +class TFurStrokeStyle final : public TOptimizedStrokeStyleT { double m_cs, m_sn, m_angle, m_length; TPixel32 m_color; @@ -119,7 +119,7 @@ public: //------------------------------------------------------------------- -class TChainStrokeStyle : public TOptimizedStrokeStyleT { +class TChainStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; public: @@ -151,7 +151,7 @@ public: //------------------------------------------------------------------- -class TSprayStrokeStyle : public TSimpleStrokeStyle { +class TSprayStrokeStyle final : public TSimpleStrokeStyle { TPixel32 m_color; double m_blend, m_intensity, m_radius; @@ -193,7 +193,7 @@ public: //------------------------------------------------------------------- -class TGraphicPenStrokeStyle +class TGraphicPenStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_intensity; @@ -238,7 +238,7 @@ public: //------------------------------------------------------------------- -class TDottedLineStrokeStyle : public TOptimizedStrokeStyleT { +class TDottedLineStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_in, m_line, m_out, m_blank; @@ -284,7 +284,7 @@ public: //------------------------------------------------------------------- -class TRopeStrokeStyle : public TOptimizedStrokeStyleT { +class TRopeStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_bend; @@ -328,7 +328,7 @@ public: //------------------------------------------------------------------- -class TCrystallizeStrokeStyle : public TOptimizedStrokeStyleT { +class TCrystallizeStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_period, m_opacity; @@ -374,7 +374,7 @@ public: //------------------------------------------------------------------- -class TBraidStrokeStyle : public TSimpleStrokeStyle { +class TBraidStrokeStyle final : public TSimpleStrokeStyle { TPixel32 m_colors[3]; double m_period; @@ -426,7 +426,7 @@ public: //------------------------------------------------------------------- -class TSketchStrokeStyle : public TSimpleStrokeStyle { +class TSketchStrokeStyle final : public TSimpleStrokeStyle { TPixel32 m_color; double m_density; @@ -470,7 +470,7 @@ public: //------------------------------------------------------------------- -class TBubbleStrokeStyle : public TSimpleStrokeStyle { +class TBubbleStrokeStyle final : public TSimpleStrokeStyle { TPixel32 m_color0, m_color1; public: @@ -520,7 +520,7 @@ public: //------------------------------------------------------------------- -class TTissueStrokeStyle : public TOptimizedStrokeStyleT { +class TTissueStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_density, m_border; @@ -565,7 +565,7 @@ public: //------------------------------------------------------------------- -class TBiColorStrokeStyle : public TOutlineStyle { +class TBiColorStrokeStyle final : public TOutlineStyle { TPixel32 m_color0, m_color1; double m_parameter; @@ -618,7 +618,7 @@ public: //------------------------------------------------------------------- -class TNormal2StrokeStyle : public TOutlineStyle { +class TNormal2StrokeStyle final : public TOutlineStyle { TPixel32 m_color; double m_lightx, m_lighty, m_shininess, m_metal, m_bend; @@ -670,7 +670,7 @@ public: //------------------------------------------------------------------- -class TChalkStrokeStyle2 : public TOptimizedStrokeStyleT { +class TChalkStrokeStyle2 final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_blend, m_intensity, m_in, m_out, m_noise; @@ -717,7 +717,8 @@ public: //------------------------------------------------------------------- -class TBlendStrokeStyle2 : public TOptimizedStrokeStyleT { +class TBlendStrokeStyle2 final + : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_blend, m_in, m_out; @@ -767,7 +768,7 @@ public: //------------------------------------------------------------------- -class TTwirlStrokeStyle : public TOptimizedStrokeStyleT { +class TTwirlStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_period, m_blend; @@ -814,7 +815,7 @@ public: //------------------------------------------------------------------- -class TSawToothStrokeStyle : public TOutlineStyle { +class TSawToothStrokeStyle final : public TOutlineStyle { TPixel32 m_color; double m_parameter; @@ -865,7 +866,8 @@ public: //------------------------------------------------------------------- -class TMultiLineStrokeStyle2 : public TOptimizedStrokeStyleT { +class TMultiLineStrokeStyle2 final + : public TOptimizedStrokeStyleT { TPixel32 m_color0, m_color1; double m_intensity, m_length, m_thick, m_noise; @@ -928,7 +930,7 @@ public: //------------------------------------------------------------------- -class TZigzagStrokeStyle : public TOptimizedStrokeStyleT { +class TZigzagStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_minDist, m_maxDist; double m_minAngle, m_maxAngle; @@ -985,7 +987,7 @@ public: //------------------------------------------------------------------- -class TSinStrokeStyle : public TOptimizedStrokeStyleT { +class TSinStrokeStyle final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_frequency, m_thick; @@ -1031,7 +1033,7 @@ public: //------------------------------------------------------------------- -class TFriezeStrokeStyle2 : public TOptimizedStrokeStyleT { +class TFriezeStrokeStyle2 final : public TOptimizedStrokeStyleT { TPixel32 m_color; double m_parameter, m_thick; @@ -1080,7 +1082,7 @@ public: //------------------------------------------------------------------- -class TDualColorStrokeStyle2 : public TOutlineStyle { +class TDualColorStrokeStyle2 final : public TOutlineStyle { TPixel32 m_color0, m_color1; double m_parameter; @@ -1143,7 +1145,7 @@ public: //------------------------------------------------------------------- -class TLongBlendStrokeStyle2 : public TOutlineStyle { +class TLongBlendStrokeStyle2 final : public TOutlineStyle { TPixel32 m_color0, m_color1; double m_parameter; @@ -1208,7 +1210,7 @@ public: #ifdef _DEBUG -class OutlineViewerStyle : public TSolidColorStyle { +class OutlineViewerStyle final : public TSolidColorStyle { double m_parameter[4]; bool m_boolPar; @@ -1269,7 +1271,7 @@ public: class TMatrioskaStrokeStyle; -class TMatrioskaStrokeProp : public TStrokeProp { +class TMatrioskaStrokeProp final : public TStrokeProp { protected: double m_outlinePixelSize; TMatrioskaStrokeStyle *m_colorStyle; @@ -1289,7 +1291,7 @@ public: void draw(TFlash &flash) override; }; -class TMatrioskaStrokeStyle : public TSolidColorStyle { +class TMatrioskaStrokeStyle final : public TSolidColorStyle { double m_parameter; TPixel32 m_color2; diff --git a/toonz/sources/colorfx/zigzagstyles.h b/toonz/sources/colorfx/zigzagstyles.h index 6d55a5c..e1a3a5d 100644 --- a/toonz/sources/colorfx/zigzagstyles.h +++ b/toonz/sources/colorfx/zigzagstyles.h @@ -7,7 +7,7 @@ #ifdef POICIPENSO -class TZigzagStrokeStyle : public TStrokeStyle { +class TZigzagStrokeStyle final : public TStrokeStyle { TPixel32 m_color; double m_density; @@ -36,7 +36,7 @@ public: } }; -class TImageBasedZigzagStrokeStyle : public TStrokeStyle { +class TImageBasedZigzagStrokeStyle final : public TStrokeStyle { TPixel32 m_color; double m_textScale; TRaster32P m_texture; diff --git a/toonz/sources/common/expressions/tgrammar.cpp b/toonz/sources/common/expressions/tgrammar.cpp index 0715ff8..da99a20 100644 --- a/toonz/sources/common/expressions/tgrammar.cpp +++ b/toonz/sources/common/expressions/tgrammar.cpp @@ -110,7 +110,7 @@ void Calculator::setRootNode(CalculatorNode *node) { //------------------------------------------------------------------- template -class Op0Node : public CalculatorNode { +class Op0Node final : public CalculatorNode { public: Op0Node(Calculator *calc) : CalculatorNode(calc) {} @@ -123,7 +123,7 @@ public: //------------------------------------------------------------------- template -class Op1Node : public CalculatorNode { +class Op1Node final : public CalculatorNode { protected: std::auto_ptr m_a; @@ -141,7 +141,7 @@ public: //------------------------------------------------------------------- template -class Op2Node : public CalculatorNode { +class Op2Node final : public CalculatorNode { protected: std::auto_ptr m_a, m_b; @@ -162,7 +162,7 @@ public: //------------------------------------------------------------------- template -class Op3Node : public CalculatorNode { +class Op3Node final : public CalculatorNode { protected: std::auto_ptr m_a, m_b, m_c; @@ -183,7 +183,7 @@ public: //------------------------------------------------------------------- -class ChsNode : public CalculatorNode { +class ChsNode final : public CalculatorNode { std::auto_ptr m_a; public: @@ -195,7 +195,7 @@ public: //------------------------------------------------------------------- -class QuestionNode : public CalculatorNode { +class QuestionNode final : public CalculatorNode { std::auto_ptr m_a, m_b, m_c; public: @@ -214,7 +214,7 @@ public: //------------------------------------------------------------------- -class NotNode : public CalculatorNode { +class NotNode final : public CalculatorNode { std::auto_ptr m_a; public: @@ -227,7 +227,7 @@ public: }; //------------------------------------------------------------------- -class CycleNode : public CalculatorNode { +class CycleNode final : public CalculatorNode { std::auto_ptr m_a; public: @@ -267,7 +267,7 @@ public: //------------------------------------------------------------------- -class RandomNode : public CalculatorNode { +class RandomNode final : public CalculatorNode { std::auto_ptr m_seed, m_min, m_max, m_arg; public: @@ -322,7 +322,7 @@ CalculatorNode *Pattern::popNode(std::vector &stack) const { //=================================================================== -class NumberPattern : public Pattern { +class NumberPattern final : public Pattern { public: bool matchToken(const std::vector &previousTokens, const Token &token) const override { @@ -346,7 +346,7 @@ public: //------------------------------------------------------------------- -class ConstantPattern : public Pattern { +class ConstantPattern final : public Pattern { std::string m_constantName; double m_value; @@ -380,7 +380,7 @@ public: //------------------------------------------------------------------- -class VariablePattern : public Pattern { +class VariablePattern final : public Pattern { std::string m_variableName; int m_varIdx; @@ -416,7 +416,7 @@ public: //------------------------------------------------------------------- template -class Op2Pattern : public Pattern { +class Op2Pattern final : public Pattern { std::string m_opName; int m_priority; @@ -453,7 +453,7 @@ public: //------------------------------------------------------------------- -class UnaryMinusPattern : public Pattern { +class UnaryMinusPattern final : public Pattern { public: UnaryMinusPattern() {} int getPriority() const override { return 50; } @@ -486,7 +486,7 @@ public: //------------------------------------------------------------------- -class NotPattern : public Pattern { +class NotPattern final : public Pattern { std::string m_prefix; public: @@ -522,7 +522,7 @@ public: //------------------------------------------------------------------- -class QuestionTernaryPattern : public Pattern { +class QuestionTernaryPattern final : public Pattern { public: QuestionTernaryPattern() {} int getPriority() const override { return 5; } @@ -557,7 +557,7 @@ public: }; //------------------------------------------------------------------- -class BraketPattern : public Pattern { +class BraketPattern final : public Pattern { public: BraketPattern() {} int getPriority() const override { return 5; } @@ -702,7 +702,7 @@ public: //------------------------------------------------------------------- template -class F0Pattern : public FunctionPattern { +class F0Pattern final : public FunctionPattern { public: F0Pattern(std::string functionName) : FunctionPattern(functionName, 0) {} void createNode(Calculator *calc, std::vector &stack, @@ -714,7 +714,7 @@ public: //------------------------------------------------------------------- template -class F1Pattern : public FunctionPattern { +class F1Pattern final : public FunctionPattern { public: F1Pattern(std::string functionName, std::string descr = "") : FunctionPattern(functionName, 1) { @@ -729,7 +729,7 @@ public: //------------------------------------------------------------------- template -class F2Pattern : public FunctionPattern { +class F2Pattern final : public FunctionPattern { public: F2Pattern(std::string functionName, std::string descr = "") : FunctionPattern(functionName, 2) { @@ -746,7 +746,7 @@ public: //------------------------------------------------------------------- template -class F3Pattern : public FunctionPattern { +class F3Pattern final : public FunctionPattern { public: F3Pattern(std::string functionName, std::string descr = "") : FunctionPattern(functionName, 3) { @@ -764,7 +764,7 @@ public: //------------------------------------------------------------------- template -class Fs2Pattern : public FunctionPattern { +class Fs2Pattern final : public FunctionPattern { public: Fs2Pattern(std::string functionName, std::string description) : FunctionPattern(functionName, 1) { @@ -782,7 +782,7 @@ public: //------------------------------------------------------------------- template -class Fs3Pattern : public FunctionPattern { +class Fs3Pattern final : public FunctionPattern { public: Fs3Pattern(std::string functionName, double defVal, std::string descr) : FunctionPattern(functionName, 1) { @@ -800,7 +800,7 @@ public: //------------------------------------------------------------------- -class CyclePattern : public FunctionPattern { +class CyclePattern final : public FunctionPattern { public: CyclePattern(std::string functionName) : FunctionPattern(functionName, 1) { setDescription( @@ -816,7 +816,7 @@ public: //------------------------------------------------------------------- -class RandomPattern : public FunctionPattern { +class RandomPattern final : public FunctionPattern { bool m_seed; public: diff --git a/toonz/sources/common/tapptools/tcli.cpp b/toonz/sources/common/tapptools/tcli.cpp index 1bef3ca..22dab09 100644 --- a/toonz/sources/common/tapptools/tcli.cpp +++ b/toonz/sources/common/tapptools/tcli.cpp @@ -37,7 +37,7 @@ void printLibRelease(ostream &out) { out << "Tnzcore 1.0 - " __DATE__ << endl; } // //--------------------------------------------------------- -class SpecialUsageElement : public UsageElement { +class SpecialUsageElement final : public UsageElement { public: SpecialUsageElement(std::string name) : UsageElement(name, " "){}; void dumpValue(ostream &) const override{}; diff --git a/toonz/sources/common/tapptools/tparamundo.cpp b/toonz/sources/common/tapptools/tparamundo.cpp index 2533cff..9b87fde 100644 --- a/toonz/sources/common/tapptools/tparamundo.cpp +++ b/toonz/sources/common/tapptools/tparamundo.cpp @@ -4,7 +4,7 @@ //#include "tparam.h" #include "tundo.h" -class ParamUndoManager : public TParamUndoManager { +class ParamUndoManager final : public TParamUndoManager { public: ParamUndoManager() {} ~ParamUndoManager() {} diff --git a/toonz/sources/common/tapptools/ttimer.cpp b/toonz/sources/common/tapptools/ttimer.cpp index de91626..2726164 100644 --- a/toonz/sources/common/tapptools/ttimer.cpp +++ b/toonz/sources/common/tapptools/ttimer.cpp @@ -166,7 +166,7 @@ public: TGenericTimerAction *m_action; }; -class SendCommandMSG : public TThread::Message { +class SendCommandMSG final : public TThread::Message { TTimer::Imp *m_ztimp; public: diff --git a/toonz/sources/common/tcache/timagecache.cpp b/toonz/sources/common/tcache/timagecache.cpp index 687f7b6..63913bc 100644 --- a/toonz/sources/common/tcache/timagecache.cpp +++ b/toonz/sources/common/tcache/timagecache.cpp @@ -68,7 +68,7 @@ class ImageInfo; TUINT32 HistoryCount = 0; //------------------------------------------------------------------------------ -class TheCodec : public TRasterCodecLz4 { +class TheCodec final : public TRasterCodecLz4 { public: static TheCodec *instance() { if (!_instance) _instance = new TheCodec(); @@ -151,7 +151,7 @@ public: //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -class RasterImageInfo : public ImageInfo { +class RasterImageInfo final : public ImageInfo { public: RasterImageInfo(const TRasterImageP &ri); @@ -195,7 +195,7 @@ ImageInfo *RasterImageInfo::clone() { return new RasterImageInfo(*this); } #include "tpalette.h" #include "ttoonzimage.h" -class ToonzImageInfo : public ImageInfo { +class ToonzImageInfo final : public ImageInfo { public: ToonzImageInfo(const TToonzImageP &ti); ~ToonzImageInfo() { @@ -241,7 +241,7 @@ void ToonzImageInfo::setInfo(const TToonzImageP &ti) { //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -class RasterImageBuilder : public ImageBuilder { +class RasterImageBuilder final : public ImageBuilder { public: ImageBuilder *clone() override { return new RasterImageBuilder(*this); } @@ -267,7 +267,7 @@ TImageP RasterImageBuilder::build(ImageInfo *info, const TRasterP &ras) { //------------------------------------------------------------------------------ #ifndef TNZCORE_LIGHT -class ToonzImageBuilder : public ImageBuilder { +class ToonzImageBuilder final : public ImageBuilder { public: ImageBuilder *clone() override { return new ToonzImageBuilder(*this); } @@ -306,7 +306,7 @@ TImageP ToonzImageBuilder::build(ImageInfo *info, const TRasterP &ras) { //------------------------------------------------------------------------------ -class UncompressedOnMemoryCacheItem : public CacheItem { +class UncompressedOnMemoryCacheItem final : public CacheItem { public: UncompressedOnMemoryCacheItem(const TImageP &image) : m_image(image) { TRasterImageP ri = m_image; @@ -369,7 +369,7 @@ TUINT32 UncompressedOnMemoryCacheItem::getSize() const { //------------------------------------------------------------------------------ -class CompressedOnMemoryCacheItem : public CacheItem { +class CompressedOnMemoryCacheItem final : public CacheItem { public: CompressedOnMemoryCacheItem(const TImageP &img); @@ -467,7 +467,7 @@ TImageP CompressedOnMemoryCacheItem::getImage() const { //------------------------------------------------------------------------------ -class CompressedOnDiskCacheItem : public CacheItem { +class CompressedOnDiskCacheItem final : public CacheItem { public: CompressedOnDiskCacheItem(const TFilePath &fp, const TRasterP &compressedRas, ImageBuilder *builder, ImageInfo *info); @@ -531,7 +531,7 @@ TImageP CompressedOnDiskCacheItem::getImage() const { //------------------------------------------------------------------------------ -class UncompressedOnDiskCacheItem : public CacheItem { +class UncompressedOnDiskCacheItem final : public CacheItem { int m_pixelsize; public: diff --git a/toonz/sources/common/tcore/tstring.cpp b/toonz/sources/common/tcore/tstring.cpp index 8bbc83c..80a5431 100644 --- a/toonz/sources/common/tcore/tstring.cpp +++ b/toonz/sources/common/tcore/tstring.cpp @@ -15,7 +15,7 @@ #include -class TStringConvertException : public TException { +class TStringConvertException final : public TException { std::string m_string; public: diff --git a/toonz/sources/common/tcore/tthread.cpp b/toonz/sources/common/tcore/tthread.cpp index 567f2b8..a5ff80b 100644 --- a/toonz/sources/common/tcore/tthread.cpp +++ b/toonz/sources/common/tcore/tthread.cpp @@ -181,7 +181,7 @@ namespace TThread { //! A Worker is a specialized QThread that continuously polls Runnable //! tasks from a global execution queue to make them work. -class Worker : public QThread { +class Worker final : public QThread { public: RunnableP m_task; @@ -220,7 +220,7 @@ public: //! tasks added through it - by copying the smart pointer to the id into each //! added task. //! \sa Executor and Runnable class. -class ExecutorId : public TSmartObject { +class ExecutorId final : public TSmartObject { public: size_t m_id; diff --git a/toonz/sources/common/tcore/tthreadp.h b/toonz/sources/common/tcore/tthreadp.h index d6319b0..9b07dc3 100644 --- a/toonz/sources/common/tcore/tthreadp.h +++ b/toonz/sources/common/tcore/tthreadp.h @@ -14,7 +14,7 @@ //-------------------------------------- // NOTE: This class should eventually be moved to tthreadmessagep.h... -class TThreadMessageDispatcher : public QObject // singleton +class TThreadMessageDispatcher final : public QObject // singleton { Q_OBJECT @@ -47,7 +47,7 @@ class ExecutorImpSlots; // ExecutorImpSlots class //------------------------------ -class TThread::ExecutorImpSlots : public QObject { +class TThread::ExecutorImpSlots final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/common/tcore/tundo.cpp b/toonz/sources/common/tcore/tundo.cpp index 3a42578..9547a5d 100644 --- a/toonz/sources/common/tcore/tundo.cpp +++ b/toonz/sources/common/tcore/tundo.cpp @@ -14,7 +14,7 @@ void callUndo(const TUndo *undo) { undo->undo(); } void callRedo(const TUndo *undo) { undo->redo(); } // void callRepeat(const TUndo* undo) {undo->repeat(); } -class TUndoBlock : public TUndo { +class TUndoBlock final : public TUndo { std::vector m_undos; typedef std::vector::const_iterator Iterator; typedef std::vector::const_reverse_iterator ReverseIterator; diff --git a/toonz/sources/common/tfx/binaryFx.cpp b/toonz/sources/common/tfx/binaryFx.cpp index e6f8b37..ff60835 100644 --- a/toonz/sources/common/tfx/binaryFx.cpp +++ b/toonz/sources/common/tfx/binaryFx.cpp @@ -252,7 +252,7 @@ void TImageCombinationFx::compatibilityTranslatePort(int major, int minor, // TImageCombinationFx heir classes //****************************************************************************************** -class OverFx : public TImageCombinationFx { +class OverFx final : public TImageCombinationFx { FX_DECLARATION(OverFx) public: @@ -266,7 +266,7 @@ public: //================================================================== -class AddFx : public TImageCombinationFx { +class AddFx final : public TImageCombinationFx { FX_DECLARATION(AddFx) TDoubleParamP m_value; @@ -289,7 +289,7 @@ public: //================================================================== -class ColorDodgeFx : public TImageCombinationFx { +class ColorDodgeFx final : public TImageCombinationFx { FX_DECLARATION(AddFx) public: @@ -303,7 +303,7 @@ public: //================================================================== -class ColorBurnFx : public TImageCombinationFx { +class ColorBurnFx final : public TImageCombinationFx { FX_DECLARATION(AddFx) public: @@ -317,7 +317,7 @@ public: //================================================================== -class ScreenFx : public TImageCombinationFx { +class ScreenFx final : public TImageCombinationFx { FX_DECLARATION(AddFx) public: @@ -333,7 +333,7 @@ public: //================================================================== -class SubFx : public TImageCombinationFx { +class SubFx final : public TImageCombinationFx { FX_DECLARATION(SubFx) TBoolParamP m_matte; @@ -351,7 +351,7 @@ public: //================================================================== -class MultFx : public TImageCombinationFx { +class MultFx final : public TImageCombinationFx { FX_DECLARATION(MultFx) TDoubleParamP m_value; @@ -375,7 +375,7 @@ public: //================================================================== -class MinFx : public TImageCombinationFx { +class MinFx final : public TImageCombinationFx { FX_DECLARATION(MinFx) TBoolParamP m_matte; @@ -395,7 +395,7 @@ public: //================================================================== -class MaxFx : public TImageCombinationFx { +class MaxFx final : public TImageCombinationFx { FX_DECLARATION(MaxFx) public: @@ -409,7 +409,7 @@ public: //================================================================== -class LinearBurnFx : public TImageCombinationFx { +class LinearBurnFx final : public TImageCombinationFx { FX_DECLARATION(LinearBurnFx) public: @@ -424,7 +424,7 @@ public: //================================================================== // This Fx is probably unused...! -class OverlayFx : public TImageCombinationFx { +class OverlayFx final : public TImageCombinationFx { FX_DECLARATION(OverlayFx) public: @@ -439,7 +439,7 @@ public: //================================================================== -class BlendFx : public TImageCombinationFx { +class BlendFx final : public TImageCombinationFx { FX_DECLARATION(BlendFx) TDoubleParamP m_value; @@ -467,7 +467,7 @@ public: // Matte Fxs definition //****************************************************************************************** -class InFx : public TBaseRasterFx { +class InFx final : public TBaseRasterFx { FX_DECLARATION(InFx) TRasterFxPort m_source, m_matte; @@ -549,7 +549,7 @@ public: //================================================================== -class OutFx : public TBaseRasterFx { +class OutFx final : public TBaseRasterFx { FX_DECLARATION(OutFx) TRasterFxPort m_source, m_matte; @@ -617,7 +617,7 @@ public: //================================================================== -class AtopFx : public TBaseRasterFx { +class AtopFx final : public TBaseRasterFx { FX_DECLARATION(AtopFx) TRasterFxPort m_up, m_dn; diff --git a/toonz/sources/common/tfx/tfxcachemanager.cpp b/toonz/sources/common/tfx/tfxcachemanager.cpp index 1ba13b1..1786b41 100644 --- a/toonz/sources/common/tfx/tfxcachemanager.cpp +++ b/toonz/sources/common/tfx/tfxcachemanager.cpp @@ -117,7 +117,7 @@ bool getTilesToBuild( // TFxCacheManager Generator //**************************************************************************************************** -class TFxCacheManagerGenerator : public TRenderResourceManagerGenerator { +class TFxCacheManagerGenerator final : public TRenderResourceManagerGenerator { public: TFxCacheManagerGenerator() : TRenderResourceManagerGenerator(true) {} diff --git a/toonz/sources/common/tfx/tpassivecachemanager.cpp b/toonz/sources/common/tfx/tpassivecachemanager.cpp index 5db0e0f..26f427b 100644 --- a/toonz/sources/common/tfx/tpassivecachemanager.cpp +++ b/toonz/sources/common/tfx/tpassivecachemanager.cpp @@ -234,7 +234,7 @@ public: bool operator!=(const Iterator &it) { return !operator==(it); } }; - class ColIterator : public Iterator { + class ColIterator final : public Iterator { ColKey m_colKey; friend class Table; @@ -256,7 +256,7 @@ public: } }; - class RowIterator : public Iterator { + class RowIterator final : public Iterator { friend class Table; RowIterator(Table *table) : Iterator(table) {} @@ -423,7 +423,8 @@ TPassiveCacheManager::FxData::~FxData() {} // TPassiveCacheManagerGenerator //--------------------------------------- -class TPassiveCacheManagerGenerator : public TRenderResourceManagerGenerator { +class TPassiveCacheManagerGenerator final + : public TRenderResourceManagerGenerator { 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 288000f..5765494 100644 --- a/toonz/sources/common/tfx/tpredictivecachemanager.cpp +++ b/toonz/sources/common/tfx/tpredictivecachemanager.cpp @@ -11,7 +11,7 @@ // Preliminaries //************************************************************************************************ -class TPredictiveCacheManagerGenerator +class TPredictiveCacheManagerGenerator final : public TRenderResourceManagerGenerator { public: TPredictiveCacheManagerGenerator() : TRenderResourceManagerGenerator(true) {} diff --git a/toonz/sources/common/tfx/trenderer.cpp b/toonz/sources/common/tfx/trenderer.cpp index 52f6889..11737bc 100644 --- a/toonz/sources/common/tfx/trenderer.cpp +++ b/toonz/sources/common/tfx/trenderer.cpp @@ -278,7 +278,7 @@ TSystem::outputDebug("~RasterPool: itemCount = " + toString // TRendererImp //--------------------- -class TRendererImp : public TSmartObject { +class TRendererImp final : public TSmartObject { public: struct RenderInstanceInfos { int m_canceled; @@ -374,7 +374,7 @@ unsigned long TRendererImp::m_renderIdCounter = 0; // RenderTask //------------------- -class RenderTask : public TThread::Runnable { +class RenderTask final : public TThread::Runnable { std::vector m_frames; unsigned long m_taskId; diff --git a/toonz/sources/common/tfx/trendererP.h b/toonz/sources/common/tfx/trendererP.h index a8491d2..b30fcd1 100644 --- a/toonz/sources/common/tfx/trendererP.h +++ b/toonz/sources/common/tfx/trendererP.h @@ -25,7 +25,7 @@ //! the mousePressEvent may cause the mouseReleaseEvent to be processed before //! the //! former's end. -class TRendererStartInvoker : public QObject { +class TRendererStartInvoker final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/common/tfx/trenderresourcemanager.cpp b/toonz/sources/common/tfx/trenderresourcemanager.cpp index ba4a400..26bdd75 100644 --- a/toonz/sources/common/tfx/trenderresourcemanager.cpp +++ b/toonz/sources/common/tfx/trenderresourcemanager.cpp @@ -15,7 +15,7 @@ container structure of the active renderIds against resource managers. */ -class RenderInstanceManagersBuilder : public TRenderResourceManager { +class RenderInstanceManagersBuilder final : public TRenderResourceManager { T_RENDER_RESOURCE_MANAGER typedef std::vector ManagersVector; @@ -38,7 +38,7 @@ public: //=============================================================================================== -class RenderInstanceManagersBuilderGenerator +class RenderInstanceManagersBuilderGenerator final : public TRenderResourceManagerGenerator { public: TRenderResourceManager *operator()(void) override { @@ -61,7 +61,7 @@ passed to the dedicated instanceScope handler. */ -class InstanceResourceManagerStub : public TRenderResourceManager { +class InstanceResourceManagerStub final : public TRenderResourceManager { TRenderResourceManagerGenerator *m_generator; public: @@ -80,7 +80,7 @@ public: //=============================================================================================== -class StubGenerator : public TRenderResourceManagerGenerator { +class StubGenerator final : public TRenderResourceManagerGenerator { TRenderResourceManagerGenerator *m_generator; public: diff --git a/toonz/sources/common/tfx/unaryFx.cpp b/toonz/sources/common/tfx/unaryFx.cpp index afcd10f..4c71c8b 100644 --- a/toonz/sources/common/tfx/unaryFx.cpp +++ b/toonz/sources/common/tfx/unaryFx.cpp @@ -170,7 +170,7 @@ FX_IDENTIFIER_IS_HIDDEN(NaAffineFx, "naAffineFx") //------------------------------------------------------------------------------ -class InvertFx : public TBaseRasterFx { +class InvertFx final : public TBaseRasterFx { FX_DECLARATION(InvertFx) TRasterFxPort m_input; TBoolParamP m_redChan, m_greenChan, m_blueChan, m_alphaChan; diff --git a/toonz/sources/common/tfx/zeraryFx.cpp b/toonz/sources/common/tfx/zeraryFx.cpp index 8adaeee..b52fe1d 100644 --- a/toonz/sources/common/tfx/zeraryFx.cpp +++ b/toonz/sources/common/tfx/zeraryFx.cpp @@ -16,7 +16,7 @@ //================================================================== -class ColorCardFx : public TBaseZeraryFx { +class ColorCardFx final : public TBaseZeraryFx { FX_DECLARATION(ColorCardFx) TPixelParamP m_color; @@ -54,7 +54,7 @@ public: //================================================================== -class CheckBoardFx : public TBaseZeraryFx { +class CheckBoardFx final : public TBaseZeraryFx { FX_DECLARATION(CheckBoardFx) TPixelParamP m_color1, m_color2; diff --git a/toonz/sources/common/tiio/tiio_bmp.cpp b/toonz/sources/common/tiio/tiio_bmp.cpp index 961641b..34d360b 100644 --- a/toonz/sources/common/tiio/tiio_bmp.cpp +++ b/toonz/sources/common/tiio/tiio_bmp.cpp @@ -88,7 +88,7 @@ void putint(FILE *fp, int i) { //========================================================= -class BmpReader : public Tiio::Reader { +class BmpReader final : public Tiio::Reader { FILE *m_chan; BMP_HEADER m_header; char *m_line; @@ -584,7 +584,7 @@ int BmpReader::read32Line(char *buffer, int x0, int x1, int shrink) { //========================================================= -class BmpWriter : public Tiio::Writer { +class BmpWriter final : public Tiio::Writer { FILE *m_chan; int m_bitPerPixel; int m_compression; diff --git a/toonz/sources/common/tiio/tiio_jpg.cpp b/toonz/sources/common/tiio/tiio_jpg.cpp index d704aef..991d5ff 100644 --- a/toonz/sources/common/tiio/tiio_jpg.cpp +++ b/toonz/sources/common/tiio/tiio_jpg.cpp @@ -142,7 +142,7 @@ int JpgReader::skipLines(int lineCount) { return lineCount; } -class JpgWriter : public Tiio::Writer { +class JpgWriter final : public Tiio::Writer { struct jpeg_compress_struct m_cinfo; struct jpeg_error_mgr m_jerr; FILE *m_chan; diff --git a/toonz/sources/common/tparam/tdoubleparam.cpp b/toonz/sources/common/tparam/tdoubleparam.cpp index 6913c97..556abc4 100644 --- a/toonz/sources/common/tparam/tdoubleparam.cpp +++ b/toonz/sources/common/tparam/tdoubleparam.cpp @@ -24,7 +24,7 @@ using namespace std; //=============================== -class TActualDoubleKeyframe : public TDoubleKeyframe { +class TActualDoubleKeyframe final : public TDoubleKeyframe { public: mutable TExpression m_expression; mutable TDoubleParamFileData m_fileData; diff --git a/toonz/sources/common/tparam/tparamset.cpp b/toonz/sources/common/tparam/tparamset.cpp index d138a03..11f963a 100644 --- a/toonz/sources/common/tparam/tparamset.cpp +++ b/toonz/sources/common/tparam/tparamset.cpp @@ -18,7 +18,7 @@ void doRelease(const std::pair ¶m) { //------------------------------------------------------------------------------ -class TParamSetImp : public TParamObserver { +class TParamSetImp final : public TParamObserver { friend class TParamSet; TParamSet *m_param; std::vector> m_params; @@ -62,7 +62,8 @@ TParamSet::~TParamSet() { delete m_imp; } //--------------------------------------------------------- /* template -class MyBackInsertIterator : public std::iterator { protected: @@ -323,7 +324,7 @@ void TParamSet::enableDragging(bool on) { /* namespace { -class DoEnableNotification : public std::binary_function { +class DoEnableNotification final : public std::binary_function { public: DoEnableNotification() {} diff --git a/toonz/sources/common/tproperty.cpp b/toonz/sources/common/tproperty.cpp index 1a166df..199597f 100644 --- a/toonz/sources/common/tproperty.cpp +++ b/toonz/sources/common/tproperty.cpp @@ -75,7 +75,7 @@ void assign(Property *dst, TProperty *src) { dst->setValue(s->getValue()); } -class Setter : public TProperty::Visitor { +class Setter final : public TProperty::Visitor { TProperty *m_src; public: @@ -111,7 +111,7 @@ void TPropertyGroup::accept(TProperty::Visitor &v) { i->first->accept(v); } -class PropertyWriter : public TProperty::Visitor { +class PropertyWriter final : public TProperty::Visitor { TOStream &m_os; public: diff --git a/toonz/sources/common/trop/runsmap.h b/toonz/sources/common/trop/runsmap.h index b7fd4f2..e6e4337 100644 --- a/toonz/sources/common/trop/runsmap.h +++ b/toonz/sources/common/trop/runsmap.h @@ -37,7 +37,7 @@ to traverse runs both forward and backwards. This means that 2 headers are provided for each run, at the opposite ends (unless the run is 1 pixel-width). */ -class RunsMap : public TRasterT { +class RunsMap final : public TRasterT { public: RunsMap(int lx, int ly) : TRasterT(lx, ly) { clear(); } @@ -62,7 +62,7 @@ public: template class DV_EXPORT_API TSmartPointerT; #endif -class RunsMapP : public TSmartPointerT { +class RunsMapP final : public TSmartPointerT { public: RunsMapP() {} RunsMapP(int lx, int ly) : TSmartPointerT(new RunsMap(lx, ly)) {} diff --git a/toonz/sources/common/trop/tdespeckle.cpp b/toonz/sources/common/trop/tdespeckle.cpp index a4f0395..d7d41ba 100644 --- a/toonz/sources/common/trop/tdespeckle.cpp +++ b/toonz/sources/common/trop/tdespeckle.cpp @@ -304,7 +304,7 @@ void DespecklingReader::closeContainer() { //======================================================================== template -class ReplacePainter : public BordersPainter { +class ReplacePainter final : public BordersPainter { typename ReplacePainter::pixel_type m_color; public: @@ -325,7 +325,7 @@ public: //--------------------------------------------------------------------------------------------- template <> -class ReplacePainter : public BordersPainter { +class ReplacePainter final : public BordersPainter { TUINT32 m_value; TUINT32 m_keepMask; @@ -352,7 +352,7 @@ public: //======================================================================== template -class IsolatedReader : public DespecklingReader { +class IsolatedReader final : public DespecklingReader { public: typedef typename PixelSelector::pixel_type pixel_type; typedef typename PixelSelector::value_type value_type; @@ -509,7 +509,7 @@ void TRop::despeckle(const TRasterP &rout, const TRasterP &rin, namespace { template -class FillingReader : public DespecklingReader { +class FillingReader final : public DespecklingReader { public: typedef typename PixelSelector::pixel_type pixel_type; typedef typename PixelSelector::value_type value_type; diff --git a/toonz/sources/common/tsound/tsop.cpp b/toonz/sources/common/tsound/tsop.cpp index 0f2b2ad..41bdebe 100644 --- a/toonz/sources/common/tsound/tsop.cpp +++ b/toonz/sources/common/tsound/tsop.cpp @@ -415,7 +415,7 @@ dstSample += tmp; //============================================================================= -class TSoundTrackResample : public TSoundTransform { +class TSoundTrackResample final : public TSoundTransform { TINT32 m_sampleRate; FLT_TYPE m_filterType; @@ -564,7 +564,7 @@ TSoundTrackP doConvertWithoutResamplingT(SRC *src, //------------------------------------------------------------------------------ -class TSoundTrackConverterWithoutResampling : public TSoundTransform { +class TSoundTrackConverterWithoutResampling final : public TSoundTransform { TSoundTrackFormat m_format; public: @@ -792,7 +792,7 @@ TSoundTrackP doReverb(TSoundTrackT *src, double delayTime, //============================================================================== -class TSoundReverb : public TSoundTransform { +class TSoundReverb final : public TSoundTransform { double m_delayTime; double m_decayFactor; double m_extendTime; @@ -899,7 +899,7 @@ TSoundTrackP doGate(TSoundTrackT *src, double threshold, double holdTime, //============================================================================== -class TSoundGate : public TSoundTransform { +class TSoundGate final : public TSoundTransform { double m_threshold; double m_holdTime; double m_releaseTime; @@ -1220,7 +1220,7 @@ TSoundTrackP mixT(TSoundTrackT *st1, double a1, TSoundTrackT *st2, //============================================================================= -class TSoundTrackMixer : public TSoundTransform { +class TSoundTrackMixer final : public TSoundTransform { double m_alpha1, m_alpha2; TSoundTrackP m_sndtrack; @@ -1360,7 +1360,7 @@ TSoundTrackP doFadeIn(const TSoundTrackT &track, double riseFactor) { //------------------------------------------------------------------------------ -class TSoundTrackFaderIn : public TSoundTransform { +class TSoundTrackFaderIn final : public TSoundTransform { public: TSoundTrackFaderIn(double riseFactor) : TSoundTransform(), m_riseFactor(riseFactor) {} @@ -1482,7 +1482,7 @@ TSoundTrackP doFadeOut(const TSoundTrackT &track, double decayFactor) { //------------------------------------------------------------------------------ -class TSoundTrackFaderOut : public TSoundTransform { +class TSoundTrackFaderOut final : public TSoundTransform { public: TSoundTrackFaderOut(double decayFactor) : TSoundTransform(), m_decayFactor(decayFactor) {} @@ -1614,7 +1614,7 @@ TSoundTrackP doCrossFade(const TSoundTrackT &track1, TSoundTrackT *track2, //------------------------------------------------------------------------------ -class TSoundTrackCrossFader : public TSoundTransform { +class TSoundTrackCrossFader final : public TSoundTransform { public: TSoundTrackCrossFader(TSoundTrackP src, double crossFactor) : TSoundTransform(), m_st(src), m_crossFactor(crossFactor) {} @@ -1780,7 +1780,7 @@ TSoundTrackP doCrossFadeOverWrite(const TSoundTrackT &track1, //------------------------------------------------------------------------------ -class TSoundTrackCrossFaderOverWrite : public TSoundTransform { +class TSoundTrackCrossFaderOverWrite final : public TSoundTransform { public: TSoundTrackCrossFaderOverWrite(TSoundTrackP src, double crossFactor) : TSoundTransform(), m_st(src), m_crossFactor(crossFactor) {} diff --git a/toonz/sources/common/tsound/tsound_l.cpp b/toonz/sources/common/tsound/tsound_l.cpp index efda15f..36219e7 100644 --- a/toonz/sources/common/tsound/tsound_l.cpp +++ b/toonz/sources/common/tsound/tsound_l.cpp @@ -2058,8 +2058,9 @@ TSoundTrackFormat TSoundInputDevice::getPreferredFormat( //****************************************************************************** //****************************************************************************** -// funzioni per l'interazione con la -//libreria +// funzioni per l'interazione con +// la +// libreria // OSS //****************************************************************************** //****************************************************************************** diff --git a/toonz/sources/common/tsound/tsound_nt.cpp b/toonz/sources/common/tsound/tsound_nt.cpp index 3b48bda..48d74e0 100644 --- a/toonz/sources/common/tsound/tsound_nt.cpp +++ b/toonz/sources/common/tsound/tsound_nt.cpp @@ -49,7 +49,7 @@ void getAmplitude(int &litude, const TSoundTrackP st, TINT32 sample); // Class to send the message that a playback is completed //============================================================================== #ifndef TNZCORE_LIGHT -class EndPlayMsg : public TThread::Message { +class EndPlayMsg final : public TThread::Message { public: EndPlayMsg(TSoundOutputDeviceListener *notifier) { m_listener = notifier; } @@ -859,7 +859,7 @@ TSoundTrackFormat TSoundOutputDevice::getPreferredFormat( //============================================================================== -class WaveFormat : public WAVEFORMATEX { +class WaveFormat final : public WAVEFORMATEX { public: WaveFormat(){}; WaveFormat(unsigned char channelCount, unsigned TINT32 sampleRate, @@ -1012,7 +1012,7 @@ void WinSoundInputDevice::stop() { //==================================================================== #ifndef TNZCORE_LIGHT -class RecordTask : public TThread::Runnable { +class RecordTask final : public TThread::Runnable { public: RecordTask(std::shared_ptr dev) : Runnable(), m_dev(std::move(dev)) {} @@ -1028,7 +1028,7 @@ public: //==================================================================== -class TSoundInputDeviceImp : public WinSoundInputDevice { +class TSoundInputDeviceImp final : public WinSoundInputDevice { public: bool m_allocateBuff; bool m_isRecording; diff --git a/toonz/sources/common/tsound/tsound_x.cpp b/toonz/sources/common/tsound/tsound_x.cpp index fb1b40e..2cb55d1 100644 --- a/toonz/sources/common/tsound/tsound_x.cpp +++ b/toonz/sources/common/tsound/tsound_x.cpp @@ -988,8 +988,9 @@ bool TSoundInputDevice::isRecording() { return m_imp->m_isRecording; } //****************************************************************************** //****************************************************************************** -// funzioni per l'interazione con la -//libreria +// funzioni per l'interazione con +// la +// libreria // audio //****************************************************************************** //****************************************************************************** diff --git a/toonz/sources/common/tsystem/tlogger.cpp b/toonz/sources/common/tsystem/tlogger.cpp index 48f85fa..a8114fa 100644 --- a/toonz/sources/common/tsystem/tlogger.cpp +++ b/toonz/sources/common/tsystem/tlogger.cpp @@ -18,7 +18,7 @@ public: std::set m_listeners; TThread::Mutex m_mutex; - class ListenerNotifier : public TThread::Message { + class ListenerNotifier final : public TThread::Message { Imp *m_imp; public: diff --git a/toonz/sources/common/tsystem/tsystem.cpp b/toonz/sources/common/tsystem/tsystem.cpp index d6a0a29..9dde853 100644 --- a/toonz/sources/common/tsystem/tsystem.cpp +++ b/toonz/sources/common/tsystem/tsystem.cpp @@ -408,7 +408,7 @@ void TSystem::hideFile(const TFilePath &fp) { //------------------------------------------------------------ -class CaselessFilepathLess +class CaselessFilepathLess final : public std::binary_function { public: bool operator()(const TFilePath &a, const TFilePath &b) const { @@ -632,7 +632,7 @@ TFilePathSet TSystem::getDisks() { //------------------------------------------------------------ -class LocalThread : public QThread { +class LocalThread final : public QThread { public: static LocalThread *currentThread() { return (LocalThread *)QThread::currentThread(); diff --git a/toonz/sources/common/tunit/tunit.cpp b/toonz/sources/common/tunit/tunit.cpp index b6134a7..9c1f2ee 100644 --- a/toonz/sources/common/tunit/tunit.cpp +++ b/toonz/sources/common/tunit/tunit.cpp @@ -9,7 +9,7 @@ //------------------------------------------------------------------- /* -class VerticalCameraFldUnitConverter : public TUnitConverter { +class VerticalCameraFldUnitConverter final : public TUnitConverter { public: static double m_factor; VerticalCameraFldUnitConverter() {} @@ -35,7 +35,7 @@ void setCurrentDpiGetter(CurrentDpiGetter f) { currentDpiGetter = f; } //------------------------------------------------------------------- -class VerticalFldUnitConverter : public TUnitConverter { +class VerticalFldUnitConverter final : public TUnitConverter { double m_factor; public: @@ -70,7 +70,7 @@ double getFieldGuideAspectRatio() { //=================================================================== -class TangentConverter : public TUnitConverter { +class TangentConverter final : public TUnitConverter { public: TangentConverter() {} TUnitConverter *clone() const override { return new TangentConverter(*this); } @@ -82,7 +82,7 @@ public: //=================================================================== -class TPixelUnitXConverter : public TUnitConverter { +class TPixelUnitXConverter final : public TUnitConverter { public: TPixelUnitXConverter() {} TUnitConverter *clone() const override { @@ -96,7 +96,7 @@ public: } }; -class TPixelUnitYConverter : public TUnitConverter { +class TPixelUnitYConverter final : public TUnitConverter { public: TPixelUnitYConverter() {} TUnitConverter *clone() const override { @@ -530,7 +530,7 @@ std::wstring TMeasuredValue::toWideString(int decimals) const { namespace { -class ZDepthUnitConverter : public TUnitConverter { +class ZDepthUnitConverter final : public TUnitConverter { TMeasureManager::CameraSizeProvider *m_cameraSizeProvider; public: @@ -550,7 +550,7 @@ public: //------------------------------------------------------------------- -class CameraZDepthUnitConverter : public TUnitConverter { +class CameraZDepthUnitConverter final : public TUnitConverter { TMeasureManager::CameraSizeProvider *m_cameraSizeProvider; public: @@ -571,7 +571,7 @@ public: //=================================================================== /*-- Zのカーブのハンドルの長さは0=0となるようにしなければならない --*/ -class ZDepthHandleUnitConverter : public TUnitConverter { +class ZDepthHandleUnitConverter final : public TUnitConverter { TMeasureManager::CameraSizeProvider *m_cameraSizeProvider; public: @@ -591,7 +591,7 @@ public: } }; -class CameraZDepthHandleUnitConverter : public TUnitConverter { +class CameraZDepthHandleUnitConverter final : public TUnitConverter { TMeasureManager::CameraSizeProvider *m_cameraSizeProvider; public: diff --git a/toonz/sources/common/tvectorimage/cornerdetector.cpp b/toonz/sources/common/tvectorimage/cornerdetector.cpp index 0912bfb..a735bd8 100644 --- a/toonz/sources/common/tvectorimage/cornerdetector.cpp +++ b/toonz/sources/common/tvectorimage/cornerdetector.cpp @@ -5,7 +5,7 @@ //====================================================================== //! Classe che definisce dei punti che consentono di trovare gli angoli -class AlgorithmPointI : public TPointI { +class AlgorithmPointI final : public TPointI { public: //! Indice originale del punto int m_originalIndex; diff --git a/toonz/sources/common/tvectorimage/tcomputeregions.cpp b/toonz/sources/common/tvectorimage/tcomputeregions.cpp index 9baa196..39679d9 100644 --- a/toonz/sources/common/tvectorimage/tcomputeregions.cpp +++ b/toonz/sources/common/tvectorimage/tcomputeregions.cpp @@ -108,7 +108,7 @@ public: inline bool empty() { return size() == 0; } }; -class Intersection : public VIListElem { +class Intersection final : public VIListElem { public: // Intersection* m_prev, *m_next; TPointD m_intersection; @@ -149,7 +149,7 @@ public: //----------------------------------------------------------------------------- -class IntersectedStroke : public VIListElem { +class IntersectedStroke final : public VIListElem { /*double m_w; TStroke *m_s; UINT m_index;*/ @@ -2563,7 +2563,7 @@ return false; //----------------------------------------------------------------------------- */ -class TRegionClockWiseFormula : public TRegionFeatureFormula { +class TRegionClockWiseFormula final : public TRegionFeatureFormula { private: double m_quasiArea; diff --git a/toonz/sources/common/tvectorimage/tsweepboundary.cpp b/toonz/sources/common/tvectorimage/tsweepboundary.cpp index 138b2d5..3589de9 100644 --- a/toonz/sources/common/tvectorimage/tsweepboundary.cpp +++ b/toonz/sources/common/tvectorimage/tsweepboundary.cpp @@ -49,7 +49,7 @@ bool isSmallStroke = false; set simpleCrossing; set nonSimpleCrossing; -class LinkedQuadratic : public TQuadratic { +class LinkedQuadratic final : public TQuadratic { public: LinkedQuadratic *prev, *next; LinkedQuadratic() : TQuadratic(), prev(0), next(0){}; @@ -1423,7 +1423,7 @@ inline bool deleteUnlinkedLoops(LinkedQuadraticList &inputBoundaries) { if (count == 0) return false; if (nonSimpleCrossing.find(current->getP2()) != nonSimpleCrossing.end()) // || - //simpleCrossing.find(current->getP2()) + // simpleCrossing.find(current->getP2()) //!= simpleCrossing.end() ) { if (current->next) current->next->prev = 0; @@ -1457,7 +1457,7 @@ inline bool deleteUnlinkedLoops(LinkedQuadraticList &inputBoundaries) { if (count == 0) return false; if (nonSimpleCrossing.find(current->getP0()) != nonSimpleCrossing.end()) // || - //simpleCrossing.find(current->getP0()) + // simpleCrossing.find(current->getP0()) //!= simpleCrossing.end() ) { if (current->prev) current->prev->next = 0; diff --git a/toonz/sources/common/tvectorimage/tvectorimageP.h b/toonz/sources/common/tvectorimage/tvectorimageP.h index ebc0ec6..19ce718 100644 --- a/toonz/sources/common/tvectorimage/tvectorimageP.h +++ b/toonz/sources/common/tvectorimage/tvectorimageP.h @@ -101,7 +101,7 @@ class Intersection; #ifdef LEVO -class TAutocloseEdge : public TGeneralEdge { +class TAutocloseEdge final : public TGeneralEdge { public: TSegment m_segment; int m_nextStrokeIndex; diff --git a/toonz/sources/common/tvrender/tellipticbrush.cpp b/toonz/sources/common/tvrender/tellipticbrush.cpp index 7b1177d..9e758e1 100644 --- a/toonz/sources/common/tvrender/tellipticbrush.cpp +++ b/toonz/sources/common/tvrender/tellipticbrush.cpp @@ -295,7 +295,7 @@ void tellipticbrush::CenterlinePoint::buildDirs(const TStroke &stroke) { namespace { -class LengthLinearizator : public tellipticbrush::StrokeLinearizator { +class LengthLinearizator final : public tellipticbrush::StrokeLinearizator { double m_lengthStep; int m_countIdx; @@ -352,7 +352,7 @@ void LengthLinearizator::linearize(std::vector &cPoints, //============================================================================================ -class RecursiveLinearizator : public tellipticbrush::StrokeLinearizator { +class RecursiveLinearizator final : public tellipticbrush::StrokeLinearizator { double m_pixSize; public: @@ -451,7 +451,7 @@ void RecursiveLinearizator::subdivide(std::vector &cPoints, //============================================================================================ -class CoverageLinearizator : public tellipticbrush::StrokeLinearizator { +class CoverageLinearizator final : public tellipticbrush::StrokeLinearizator { public: CoverageLinearizator(const TStroke *stroke) : StrokeLinearizator(stroke) {} diff --git a/toonz/sources/common/tvrender/tfont_qt.cpp b/toonz/sources/common/tvrender/tfont_qt.cpp index dfb68c7..5b431bb 100644 --- a/toonz/sources/common/tvrender/tfont_qt.cpp +++ b/toonz/sources/common/tvrender/tfont_qt.cpp @@ -85,7 +85,8 @@ TPoint TFont::drawChar(TVectorImageP &image, wchar_t charcode, if (path.elementCount() < 1) return getDistance(charcode, nextCharCode); // force closing the last path - if (path.elementAt(path.elementCount() - 1).type != QPainterPath::MoveToElement) { + if (path.elementAt(path.elementCount() - 1).type != + QPainterPath::MoveToElement) { path.moveTo(0.0, 0.0); } @@ -237,7 +238,8 @@ TPoint TFont::getDistance(wchar_t firstChar, wchar_t secondChar) const { return TPoint(0, 0); } - if (!raw.advancesForGlyphIndexes(indices, advances, 2, QRawFont::KernedAdvances)) { + if (!raw.advancesForGlyphIndexes(indices, advances, 2, + QRawFont::KernedAdvances)) { return TPoint(0, 0); } @@ -353,8 +355,8 @@ void TFontManager::setFamily(const wstring family) { m_pimpl->m_currentFamily = family; - // XXX: if current style is not valid for family, reset it? - // doing so asserts when chosing a font in the GUI +// XXX: if current style is not valid for family, reset it? +// doing so asserts when chosing a font in the GUI #if 0 QStringList styles = m_pimpl->m_qfontdb->styles(qFamily); if (styles.contains(QString::fromStdWString(m_pimpl->m_currentTypeface))) { diff --git a/toonz/sources/common/tvrender/tofflinegl.cpp b/toonz/sources/common/tvrender/tofflinegl.cpp index 20e5f62..a3d2d44 100644 --- a/toonz/sources/common/tvrender/tofflinegl.cpp +++ b/toonz/sources/common/tvrender/tofflinegl.cpp @@ -69,7 +69,7 @@ static QMutex win32ImpMutex; //------------------------------- -class WIN32Implementation : public TOfflineGL::Imp { +class WIN32Implementation final : public TOfflineGL::Imp { public: HDC m_offDC; HGDIOBJ m_oldobj; @@ -309,7 +309,7 @@ std::shared_ptr defaultOfflineGLGenerator( #elif defined(LINUX) -class XImplementation : public TOfflineGL::Imp { +class XImplementation final : public TOfflineGL::Imp { public: Display *m_dpy; GLXContext m_context; @@ -507,7 +507,7 @@ TOfflineGL::ImpGenerator *currentImpGenerator = defaultOfflineGLGenerator; // namespace { -class MessageCreateContext : public TThread::Message { +class MessageCreateContext final : public TThread::Message { friend class TOfflineGL; TOfflineGL *m_ogl; @@ -836,7 +836,7 @@ int TOfflineGL::getLy() const { return m_imp->getLy(); } namespace { -struct DimensionLess +struct DimensionLess final : public std::binary_function { bool operator()(const TDimension &d1, const TDimension &d2) const { return d1.lx < d2.lx || (d1.lx == d2.lx && d1.ly < d2.ly); diff --git a/toonz/sources/common/tvrender/tpalette.cpp b/toonz/sources/common/tvrender/tpalette.cpp index 76d3c88..16a6a70 100644 --- a/toonz/sources/common/tvrender/tpalette.cpp +++ b/toonz/sources/common/tvrender/tpalette.cpp @@ -416,7 +416,7 @@ bool TPalette::getFxRects(const TRect &rect, TRect &rectIn, TRect &rectOut) { namespace { -class StyleWriter : public TOutputStreamInterface { +class StyleWriter final : public TOutputStreamInterface { TOStream &m_os; int m_index; @@ -469,7 +469,7 @@ public: //------------------------------------------------------------------- -class StyleReader : public TInputStreamInterface { +class StyleReader final : public TInputStreamInterface { TIStream &m_is; //!< Wrapped input stream. VersionNumber m_version; //!< Palette version number (overrides m_is's one). diff --git a/toonz/sources/common/tvrender/tsimplecolorstyles.cpp b/toonz/sources/common/tvrender/tsimplecolorstyles.cpp index 2fb4db8..42b794c 100644 --- a/toonz/sources/common/tvrender/tsimplecolorstyles.cpp +++ b/toonz/sources/common/tvrender/tsimplecolorstyles.cpp @@ -165,7 +165,7 @@ public: }; //---------------------------------------------- - struct KeyLess : public std::binary_function { + struct KeyLess final : public std::binary_function { bool operator()(const Key &d1, const Key &d2) const { return d1.m_glContext < d2.m_glContext || (d1.m_glContext == d2.m_glContext && diff --git a/toonz/sources/common/tvrender/tvectorbrush.cpp b/toonz/sources/common/tvrender/tvectorbrush.cpp index 709cf64..481f894 100644 --- a/toonz/sources/common/tvrender/tvectorbrush.cpp +++ b/toonz/sources/common/tvrender/tvectorbrush.cpp @@ -118,7 +118,8 @@ void getHRange(const TStroke &stroke, double &x0, double &x1) { // Outlinization Data //******************************************************************************** -struct StrokeOutlinizationData : public tellipticbrush::OutlinizationData { +struct StrokeOutlinizationData final + : public tellipticbrush::OutlinizationData { double m_x0, m_x1, m_xRange; double m_y0, m_yScale; @@ -372,7 +373,7 @@ ReferenceLinearizator::ReferenceLinearizator( // Brush Linearizator on Path inter-chunk points //******************************************************************************** -class ReferenceChunksLinearizator : public ReferenceLinearizator { +class ReferenceChunksLinearizator final : public ReferenceLinearizator { double m_w0, m_w1; public: @@ -507,7 +508,7 @@ void ReferenceChunksLinearizator::addCenterlinePoints( // Recursive (regular) Reference Stroke Linearizator //******************************************************************************** -class RecursiveReferenceLinearizator : public ReferenceLinearizator { +class RecursiveReferenceLinearizator final : public ReferenceLinearizator { public: typedef void (RecursiveReferenceLinearizator::*SubdivisorFuncPtr)( std::vector &cPoints, CenterlinePoint &cp0, diff --git a/toonz/sources/common/tvrender/tvectorbrushstyle.cpp b/toonz/sources/common/tvrender/tvectorbrushstyle.cpp index 5500b11..5afd443 100644 --- a/toonz/sources/common/tvrender/tvectorbrushstyle.cpp +++ b/toonz/sources/common/tvrender/tvectorbrushstyle.cpp @@ -24,7 +24,7 @@ TFilePath TVectorBrushStyle::m_rootDir = TFilePath(); // Vector Brush Prop declaration //********************************************************************** -class VectorBrushProp : public TStrokeProp { +class VectorBrushProp final : public TStrokeProp { TVectorBrushStyle *m_style; TVectorImageP m_brush; TRectD m_brushBox; diff --git a/toonz/sources/common/twain/twain.h b/toonz/sources/common/twain/twain.h index e51357f..4e6695b 100644 --- a/toonz/sources/common/twain/twain.h +++ b/toonz/sources/common/twain/twain.h @@ -1434,13 +1434,13 @@ typedef struct { */ #define DF_DSM2 0x10000000L /* added to the identity by the DSM */ #define DF_APP2 \ - 0x20000000L /* Set by the App to indicate it would \ \ \ + 0x20000000L /* Set by the App to indicate it would \ \ \ \ \ prefer to use DSM2 */ #define DF_DS2 \ - 0x40000000L /* Set by the DS to indicate it would \ \ \ + 0x40000000L /* Set by the DS to indicate it would \ \ \ \ \ prefer to use DSM2 */ #define DG_MASK \ - 0xFFFFL /* all Data Groups limited to 16 bit. Added for 2.1 \ \ + 0xFFFFL /* all Data Groups limited to 16 bit. Added for 2.1 \ \ \ \ */ /**************************************************************************** @@ -1488,13 +1488,19 @@ typedef struct { /* misplaced */ #define DAT_ICCPROFILE \ - 0x0401 /* TW_MEMORY Added 1.91 This Data Argument is misplaced but \ \ + 0x0401 /* TW_MEMORY Added 1.91 This Data Argument is misplaced but \ \ + \ \ + \ \ \ belongs to the DG_IMAGE Data Group */ #define DAT_IMAGEMEMFILEXFER \ - 0x0402 /* TW_IMAGEMEMXFER Added 1.91 This Data Argument is misplaced but \ \ + 0x0402 /* TW_IMAGEMEMXFER Added 1.91 This Data Argument is misplaced but \ \ + \ \ + \ \ \ belongs to the DG_IMAGE Data Group */ #define DAT_ENTRYPOINT \ - 0x0403 /* TW_ENTRYPOINT Added 2.0 This Data Argument is misplaced but \ \ + 0x0403 /* TW_ENTRYPOINT Added 2.0 This Data Argument is misplaced but \ \ + \ \ + \ \ \ belongs to the DG_CONTROL Data Group */ /**************************************************************************** @@ -1862,7 +1868,7 @@ typedef struct { #define TWCC_CAPBADOPERATION \ 14 /* Operation not supported by capability */ #define TWCC_CAPSEQERROR \ - 15 /* Capability has dependancy on other capability \ \ + 15 /* Capability has dependancy on other capability \ \ \ \ */ #define TWCC_DENIED \ 16 /* File System operation is denied (file is protected) Added 1.8 */ @@ -1877,7 +1883,7 @@ typedef struct { #define TWCC_PAPERDOUBLEFEED \ 21 /* The feeder detected multiple pages Added 1.8 */ #define TWCC_FILEWRITEERROR \ - 22 /* Error writing the file (meant for things like disk full \ \ + 22 /* Error writing the file (meant for things like disk full \ \ \ \ conditions)Added 1.8 */ #define TWCC_CHECKDEVICEONLINE \ 23 /* The device went offline prior to or during this operation Added 1.8 */ @@ -1924,10 +1930,11 @@ typedef wchar_t TW_UNI512[512], FAR *pTW_UNI512; #define TWFF_JPN 12 /* 1.91 */ #define DAT_TWUNKIDENTITY \ - 0x000b /* Additional message required for thunker to request the special \ \ + 0x000b /* Additional message required for thunker to request the special \ \ \ + \ \ identity information. */ #define DAT_SETUPFILEXFER2 \ - 0x0301 /* Data transfer via a file. deprecated - use DAT_SETUPFILEXFER \ \ + 0x0301 /* Data transfer via a file. deprecated - use DAT_SETUPFILEXFER \ \ \ \ instead*/ #define CAP_SUPPORTEDCAPSEXT 0x100c diff --git a/toonz/sources/image/3gp/tiio_3gp.h b/toonz/sources/image/3gp/tiio_3gp.h index faf33ab..631dfbe 100644 --- a/toonz/sources/image/3gp/tiio_3gp.h +++ b/toonz/sources/image/3gp/tiio_3gp.h @@ -46,7 +46,7 @@ class TImageReader3gp; bool IsQuickTimeInstalled(); -class TLevelWriter3gp : public TLevelWriter { +class TLevelWriter3gp final : public TLevelWriter { public: TLevelWriter3gp(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriter3gp(); @@ -83,7 +83,7 @@ public: void saveSoundTrack(TSoundTrack *st) override; }; -class TLevelReader3gp : public TLevelReader { +class TLevelReader3gp final : public TLevelReader { public: TLevelReader3gp(const TFilePath &path); ~TLevelReader3gp(); diff --git a/toonz/sources/image/3gp/tiio_3gpW.cpp b/toonz/sources/image/3gp/tiio_3gpW.cpp index 85e1410..0a7472f 100644 --- a/toonz/sources/image/3gp/tiio_3gpW.cpp +++ b/toonz/sources/image/3gp/tiio_3gpW.cpp @@ -196,7 +196,7 @@ const std::string CodecQualityId = "PU_CodecQuality"; // TImageWriterMov //------------------------------------------------------------------------------ -class TImageWriter3gp : public TImageWriter { +class TImageWriter3gp final : public TImageWriter { public: TImageWriter3gp(const TFilePath &, int frameIndex, TLevelWriter3gp *); ~TImageWriter3gp() { m_lwm->release(); } @@ -218,7 +218,7 @@ private: //----------------------------------------------------------- // TImageReaderv //----------------------------------------------------------- -class TImageReader3gp : public TImageReader { +class TImageReader3gp final : public TImageReader { public: TImageReader3gp(const TFilePath &, int frameIndex, TLevelReader3gp *); ~TImageReader3gp() { m_lrm->release(); } diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp index 4f7e0e4..d1bd797 100644 --- a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp +++ b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp @@ -36,7 +36,7 @@ // TImageWriter3gp Proxy implementation //****************************************************************************** -class TImageWriter3gpProxy : public TImageWriter { +class TImageWriter3gpProxy final : public TImageWriter { TLevelWriter3gp *m_lw; public: @@ -237,7 +237,7 @@ void TLevelWriter3gp::saveSoundTrack(TSoundTrack *st) { // TImageReaderMov Proxy implementation //****************************************************************************** -class TImageReader3gpProxy : public TImageReader { +class TImageReader3gpProxy final : public TImageReader { TLevelReader3gp *m_lr; TImageInfo *m_info; diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.h b/toonz/sources/image/3gp/tiio_3gp_proxy.h index 7cb06cd..db8a539 100644 --- a/toonz/sources/image/3gp/tiio_3gp_proxy.h +++ b/toonz/sources/image/3gp/tiio_3gp_proxy.h @@ -22,7 +22,7 @@ bool IsQuickTimeInstalled(); // TLevelWriter3gp Proxy - delegates to a background 32-bit process //****************************************************************************** -class TLevelWriter3gp : public TLevelWriter { +class TLevelWriter3gp final : public TLevelWriter { unsigned int m_id; public: @@ -48,7 +48,7 @@ public: // TLevelReader3gp Proxy //****************************************************************************** -class TLevelReader3gp : public TLevelReader { +class TLevelReader3gp final : public TLevelReader { unsigned int m_id; int m_lx, m_ly; diff --git a/toonz/sources/image/avi/tiio_avi.cpp b/toonz/sources/image/avi/tiio_avi.cpp index 97a814e..a72bfac 100644 --- a/toonz/sources/image/avi/tiio_avi.cpp +++ b/toonz/sources/image/avi/tiio_avi.cpp @@ -126,7 +126,7 @@ bool isAKeyFrame(PAVISTREAM videoStream, int index) { // //=========================================================== -class TImageWriterAvi : public TImageWriter { +class TImageWriterAvi final : public TImageWriter { public: int m_frameIndex; @@ -603,7 +603,7 @@ void TLevelWriterAvi::doSaveSoundTrack() { // //=========================================================== -class TImageReaderAvi : public TImageReader { +class TImageReaderAvi final : public TImageReader { public: int m_frameIndex; diff --git a/toonz/sources/image/avi/tiio_avi.h b/toonz/sources/image/avi/tiio_avi.h index 963d126..e61eff9 100644 --- a/toonz/sources/image/avi/tiio_avi.h +++ b/toonz/sources/image/avi/tiio_avi.h @@ -20,7 +20,7 @@ class VDVideoDecompressor; // //=========================================================== -class TLevelWriterAvi : public TLevelWriter { +class TLevelWriterAvi final : public TLevelWriter { public: TLevelWriterAvi(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterAvi(); @@ -67,7 +67,7 @@ private: // //=========================================================== -class TLevelReaderAvi : public TLevelReader { +class TLevelReaderAvi final : public TLevelReader { public: TLevelReaderAvi(const TFilePath &path); ~TLevelReaderAvi(); @@ -104,7 +104,7 @@ private: //=========================================================== namespace Tiio { -class AviWriterProperties : public TPropertyGroup { +class AviWriterProperties final : public TPropertyGroup { public: AviWriterProperties(); TEnumProperty m_codec; diff --git a/toonz/sources/image/mesh/tiio_mesh.cpp b/toonz/sources/image/mesh/tiio_mesh.cpp index 843fb02..2dc41d9 100644 --- a/toonz/sources/image/mesh/tiio_mesh.cpp +++ b/toonz/sources/image/mesh/tiio_mesh.cpp @@ -13,7 +13,7 @@ // TImageWriterMesh definition //******************************************************************************** -class TImageWriterMesh : public TImageWriter { +class TImageWriterMesh final : public TImageWriter { TFrameId m_fid; //!< The frame id public: @@ -76,7 +76,7 @@ void TImageWriterMesh::save(const TImageP &img) { // TImageReaderMesh definition //******************************************************************************** -class TImageReaderMesh : public TImageReader { +class TImageReaderMesh final : public TImageReader { TFrameId m_fid; //> m_savedFrames; int m_IOError; @@ -110,7 +110,7 @@ public: // Mov TLevelReader class //*********************************************************************************** -class DVAPI TLevelReaderMov : public TLevelReader { +class DVAPI TLevelReaderMov final : public TLevelReader { bool m_readAsToonzOutput; // default: false bool m_yMirror; // default: true bool m_loadTimecode; // default: false @@ -161,7 +161,7 @@ private: namespace Tiio { -class MovWriterProperties : public TPropertyGroup { +class MovWriterProperties final : public TPropertyGroup { public: MovWriterProperties(); }; diff --git a/toonz/sources/image/mov/tiio_movW.cpp b/toonz/sources/image/mov/tiio_movW.cpp index 46a91c4..0b07b7c 100644 --- a/toonz/sources/image/mov/tiio_movW.cpp +++ b/toonz/sources/image/mov/tiio_movW.cpp @@ -213,7 +213,7 @@ bool IsQuickTimeInstalled() { // TImageWriterMov //------------------------------------------------------------------------------ -class TImageWriterMov : public TImageWriter { +class TImageWriterMov final : public TImageWriter { public: TImageWriterMov(const TFilePath &, int frameIndex, TLevelWriterMov *); ~TImageWriterMov() { m_lwm->release(); } @@ -294,7 +294,7 @@ return new TWriterInfoMov(*this); */ //----------------------------------------------------------- /* -class MovWriterProperties : public TPropertyGroup { +class MovWriterProperties final : public TPropertyGroup { public: TEnumProperty m_codec; TEnumProperty m_quality; @@ -1000,7 +1000,7 @@ void TLevelReaderMov::enableRandomAccessRead(bool enable) { // TImageReaderMov //----------------------------------------------------------- -class TImageReaderMov : public TImageReader { +class TImageReaderMov final : public TImageReader { TLevelReaderMov *m_lrm; TImageInfo *m_info; diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp index c513962..260bbb1 100644 --- a/toonz/sources/image/mov/tiio_mov_proxy.cpp +++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp @@ -104,7 +104,7 @@ err: // TImageWriterMov Proxy implementation //****************************************************************************** -class TImageWriterMovProxy : public TImageWriter { +class TImageWriterMovProxy final : public TImageWriter { TLevelWriterMov *m_lw; public: @@ -305,7 +305,7 @@ void TLevelWriterMov::saveSoundTrack(TSoundTrack *st) { // TImageReaderMov Proxy implementation //****************************************************************************** -class TImageReaderMovProxy : public TImageReader { +class TImageReaderMovProxy final : public TImageReader { TLevelReaderMov *m_lr; TImageInfo *m_info; diff --git a/toonz/sources/image/mov/tiio_mov_proxy.h b/toonz/sources/image/mov/tiio_mov_proxy.h index 661e376..386c79d 100644 --- a/toonz/sources/image/mov/tiio_mov_proxy.h +++ b/toonz/sources/image/mov/tiio_mov_proxy.h @@ -22,7 +22,7 @@ bool IsQuickTimeInstalled(); // TLevelWriterMov Proxy - delegates to a background 32-bit process //****************************************************************************** -class TLevelWriterMov : public TLevelWriter { +class TLevelWriterMov final : public TLevelWriter { unsigned int m_id; public: @@ -48,7 +48,7 @@ public: // TLevelReaderMov Proxy //****************************************************************************** -class TLevelReaderMov : public TLevelReader { +class TLevelReaderMov final : public TLevelReader { unsigned int m_id; int m_lx, m_ly; @@ -76,7 +76,7 @@ public: //=========================================================================== namespace Tiio { -class MovWriterProperties : public TPropertyGroup { +class MovWriterProperties final : public TPropertyGroup { public: MovWriterProperties(); }; diff --git a/toonz/sources/image/pli/pli_io.cpp b/toonz/sources/image/pli/pli_io.cpp index ba10162..420dfd7 100644 --- a/toonz/sources/image/pli/pli_io.cpp +++ b/toonz/sources/image/pli/pli_io.cpp @@ -74,7 +74,7 @@ TThickPoint operator*(const TAffine &aff, const TThickPoint &p) { /*=====================================================================*/ -class MyOfstream : public Tofstream { +class MyOfstream final : public Tofstream { public: MyOfstream(const TFilePath &path) : Tofstream(path) {} @@ -285,10 +285,10 @@ UINT TStyleParam::getSize() { #else #define CHECK_FOR_READ_ERROR(filePath) \ { \ - /*if (m_iChan.flags()&(ios::failbit|ios::eofbit)) \ \ \ - { \ \ \ - m_lastError = PREMATURE_EOF; \ \ \ - throw TImageException( filePath, "Error on reading file"); \ \ \ + /*if (m_iChan.flags()&(ios::failbit|ios::eofbit)) \ \ \ \ \ + { \ \ \ \ \ + m_lastError = PREMATURE_EOF; \ \ \ \ \ + throw TImageException( filePath, "Error on reading file"); \ \ \ \ \ }*/ \ } #endif diff --git a/toonz/sources/image/pli/pli_io.h b/toonz/sources/image/pli/pli_io.h index e0ac6de..ecb2134 100644 --- a/toonz/sources/image/pli/pli_io.h +++ b/toonz/sources/image/pli/pli_io.h @@ -159,7 +159,7 @@ real tags; their structures resembles the structure in the PLI file and the description in the PLI specific document =====================================================================*/ -class TextTag : public PliObjectTag { +class TextTag final : public PliObjectTag { public: std::string m_text; @@ -171,7 +171,7 @@ public: //===================================================================== /*! */ -class PaletteTag : public PliTag { +class PaletteTag final : public PliTag { public: TUINT32 m_numColors; TPixelRGBM32 *m_color; @@ -187,7 +187,7 @@ public: //===================================================================== /*! */ -class PaletteWithAlphaTag : public PliTag { +class PaletteWithAlphaTag final : public PliTag { public: TUINT32 m_numColors; TPixelRGBM32 *m_color; @@ -207,7 +207,7 @@ All the geometric tags that contains curve informations are instantiations of this template class */ -class ThickQuadraticChainTag : public PliGeometricTag { +class ThickQuadraticChainTag final : public PliGeometricTag { public: TUINT32 m_numCurves; std::unique_ptr m_curve; @@ -257,7 +257,7 @@ private: /*! Not yet implemented */ -class BitmapTag : public PliGeometricTag { +class BitmapTag final : public PliGeometricTag { public: enum compressionType { NONE = 0, RLE, HOW_MANY_COMPRESSION }; @@ -274,7 +274,7 @@ public: Not yet implemented */ -class ColorTag : public PliObjectTag { +class ColorTag final : public PliObjectTag { public: enum styleType { STYLE_NONE = 0, @@ -308,7 +308,7 @@ public: //===================================================================== -class StyleTag : public PliObjectTag { +class StyleTag final : public PliObjectTag { public: USHORT m_id; USHORT m_pageIndex; @@ -324,7 +324,7 @@ public: //===================================================================== -class GeometricTransformationTag : public PliGeometricTag { +class GeometricTransformationTag final : public PliGeometricTag { public: TAffine m_affine; PliGeometricTag *m_object; @@ -338,7 +338,7 @@ public: //===================================================================== -class GroupTag : public PliObjectTag { +class GroupTag final : public PliObjectTag { public: enum { NONE = 0, @@ -364,7 +364,7 @@ public: //===================================================================== -class ImageTag : public PliObjectTag { +class ImageTag final : public PliObjectTag { public: TFrameId m_numFrame; @@ -381,7 +381,7 @@ public: //===================================================================== -class DoublePairTag : public PliObjectTag { +class DoublePairTag final : public PliObjectTag { public: double m_first, m_second; @@ -393,7 +393,7 @@ public: //===================================================================== -class IntersectionDataTag : public PliObjectTag { +class IntersectionDataTag final : public PliObjectTag { public: UINT m_branchCount; std::unique_ptr m_branchArray; @@ -409,7 +409,7 @@ public: //===================================================================== -class StrokeOutlineOptionsTag : public PliObjectTag { +class StrokeOutlineOptionsTag final : public PliObjectTag { public: TStroke::OutlineOptions m_options; @@ -419,7 +419,7 @@ public: //===================================================================== -class PrecisionScaleTag : public PliObjectTag { +class PrecisionScaleTag final : public PliObjectTag { public: int m_precisionScale; diff --git a/toonz/sources/image/pli/tiio_pli.cpp b/toonz/sources/image/pli/tiio_pli.cpp index 732a8ef..f0f51c7 100644 --- a/toonz/sources/image/pli/tiio_pli.cpp +++ b/toonz/sources/image/pli/tiio_pli.cpp @@ -25,7 +25,7 @@ namespace { //--------------------------------------------------------------------------- -class PliOuputStream : public TOutputStreamInterface { +class PliOuputStream final : public TOutputStreamInterface { std::vector *m_stream; public: @@ -58,7 +58,7 @@ public: //--------------------------------------------------------------------------- -class PliInputStream : public TInputStreamInterface { +class PliInputStream final : public TInputStreamInterface { std::vector *m_stream; VersionNumber m_version; int m_count; @@ -240,7 +240,7 @@ pli->m_idWrittenColorsArray[0]=true; /* Classe locale per la scrittura di un frame del livello. */ -class TImageWriterPli : public TImageWriter { +class TImageWriterPli final : public TImageWriter { public: TImageWriterPli(const TFilePath &, const TFrameId &frameId, TLevelWriterPli *); diff --git a/toonz/sources/image/pli/tiio_pli.h b/toonz/sources/image/pli/tiio_pli.h index f21cf58..2a35e62 100644 --- a/toonz/sources/image/pli/tiio_pli.h +++ b/toonz/sources/image/pli/tiio_pli.h @@ -14,7 +14,7 @@ class TImageReaderPli; //=========================================================================== /* -class TWriterInfoPli : public TWriterInfo { +class TWriterInfoPli final : public TWriterInfo { public: ~TWriterInfoPli() {} @@ -33,7 +33,7 @@ private: /*! TLevelWriterPli: */ -class TLevelWriterPli : public TLevelWriter { +class TLevelWriterPli final : public TLevelWriter { //! object to manage a pli std::unique_ptr m_pli; @@ -68,7 +68,7 @@ typedef std::pair pliFrameInfo; /*! TLevelReaderPli: */ -class TLevelReaderPli : public TLevelReader { +class TLevelReaderPli final : public TLevelReader { public: TLevelReaderPli(const TFilePath &path); ~TLevelReaderPli(); @@ -120,7 +120,7 @@ private: /* Classe locale per la lettura di un frame del livello. */ -class TImageReaderPli : public TImageReader { +class TImageReaderPli final : public TImageReader { public: TFrameId m_frameId; //getRawData(); } else { m_rowsPerStrip = rps; - // if(m_rowsPerStrip<=0) m_rowsPerStrip = 1; //potrei mettere + // if(m_rowsPerStrip<=0) m_rowsPerStrip = 1; //potrei + // mettere // qualsiasi // valore // purchè sia lo stesso in tif_getimage.c linea 2512 @@ -722,7 +723,7 @@ Tiio::TifWriterProperties::TifWriterProperties() //============================================================ -class TifWriter : public Tiio::Writer { +class TifWriter final : public Tiio::Writer { TIFF *m_tiff; int m_row; // Tiio::TifWriterProperties m_properties; diff --git a/toonz/sources/image/tif/tiio_tif.h b/toonz/sources/image/tif/tiio_tif.h index 7145506..523b138 100644 --- a/toonz/sources/image/tif/tiio_tif.h +++ b/toonz/sources/image/tif/tiio_tif.h @@ -41,7 +41,7 @@ namespace Tiio { //=========================================================================== -class TifWriterProperties : public TPropertyGroup { +class TifWriterProperties final : public TPropertyGroup { public: TEnumProperty m_byteOrdering; TEnumProperty m_compressionType; diff --git a/toonz/sources/image/tzl/tiio_tzl.cpp b/toonz/sources/image/tzl/tiio_tzl.cpp index af4c64b..9a36346 100644 --- a/toonz/sources/image/tzl/tiio_tzl.cpp +++ b/toonz/sources/image/tzl/tiio_tzl.cpp @@ -321,7 +321,7 @@ void getThumbnail(TRasterP ras, int shrink, TRasterP &thumbnail) { //------------------------------------------------------------------- -class TImageReaderTzl : public TImageReader { +class TImageReaderTzl final : public TImageReader { public: TImageReaderTzl(const TFilePath &f, const TFrameId &fid, TLevelReaderTzl *); ~TImageReaderTzl() {} @@ -366,7 +366,7 @@ private: // //------------------------------------------------------------------- -class TImageWriterTzl : public TImageWriter { +class TImageWriterTzl final : public TImageWriter { //! Reference to level writer TLevelWriterTzl *m_lwp; TFrameId m_fid; diff --git a/toonz/sources/image/tzl/tiio_tzl.h b/toonz/sources/image/tzl/tiio_tzl.h index 10a2d71..6243198 100644 --- a/toonz/sources/image/tzl/tiio_tzl.h +++ b/toonz/sources/image/tzl/tiio_tzl.h @@ -30,7 +30,7 @@ private: typedef std::map TzlOffsetMap; class TRasterCodecLZO; -class TLevelWriterTzl : public TLevelWriter { +class TLevelWriterTzl final : public TLevelWriter { // bool m_paletteWritten; bool m_headerWritten; bool m_creatorWritten; @@ -134,7 +134,7 @@ private: /*! TLevelReaderTzl: */ -class TLevelReaderTzl : public TLevelReader { +class TLevelReaderTzl final : public TLevelReader { public: TLevelReaderTzl(const TFilePath &path); ~TLevelReaderTzl(); diff --git a/toonz/sources/image/tzp/tiio_plt.cpp b/toonz/sources/image/tzp/tiio_plt.cpp index 45c04db..49e983e 100644 --- a/toonz/sources/image/tzp/tiio_plt.cpp +++ b/toonz/sources/image/tzp/tiio_plt.cpp @@ -19,7 +19,7 @@ extern "C" { //============================================================ -class PltReader : public Tiio::Reader { +class PltReader final : public Tiio::Reader { TIFF *m_tiff; int m_row; bool m_tiled, m_stripped; diff --git a/toonz/sources/image/tzp/tiio_tzp.cpp b/toonz/sources/image/tzp/tiio_tzp.cpp index 61ba762..8e638b6 100644 --- a/toonz/sources/image/tzp/tiio_tzp.cpp +++ b/toonz/sources/image/tzp/tiio_tzp.cpp @@ -18,7 +18,7 @@ //============================================================ -class TzpReader : public Tiio::Reader { +class TzpReader final : public Tiio::Reader { TIFF *m_tiff; int m_row; bool m_tiled, m_stripped; diff --git a/toonz/sources/include/ext/CornerDeformation.h b/toonz/sources/include/ext/CornerDeformation.h index e1cbd3d..3e7ff5c 100644 --- a/toonz/sources/include/ext/CornerDeformation.h +++ b/toonz/sources/include/ext/CornerDeformation.h @@ -26,7 +26,7 @@ #endif namespace ToonzExt { -class DVAPI CornerDeformation : public StrokeDeformationImpl { +class DVAPI CornerDeformation final : public StrokeDeformationImpl { CornerDeformation(); public: diff --git a/toonz/sources/include/ext/LinearPotential.h b/toonz/sources/include/ext/LinearPotential.h index c724205..c289b7b 100644 --- a/toonz/sources/include/ext/LinearPotential.h +++ b/toonz/sources/include/ext/LinearPotential.h @@ -23,7 +23,7 @@ #endif namespace ToonzExt { -class DVAPI LinearPotential : public Potential { +class DVAPI LinearPotential final : public Potential { public: virtual ~LinearPotential(); diff --git a/toonz/sources/include/ext/NotSimmetricBezierPotential.h b/toonz/sources/include/ext/NotSimmetricBezierPotential.h index 277c4f1..397ab80 100644 --- a/toonz/sources/include/ext/NotSimmetricBezierPotential.h +++ b/toonz/sources/include/ext/NotSimmetricBezierPotential.h @@ -23,7 +23,7 @@ #endif namespace ToonzExt { -class DVAPI NotSimmetricBezierPotential : public Potential { +class DVAPI NotSimmetricBezierPotential final : public Potential { public: virtual ~NotSimmetricBezierPotential(); diff --git a/toonz/sources/include/ext/NotSimmetricExpPotential.h b/toonz/sources/include/ext/NotSimmetricExpPotential.h index 75b9532..6ca337d 100644 --- a/toonz/sources/include/ext/NotSimmetricExpPotential.h +++ b/toonz/sources/include/ext/NotSimmetricExpPotential.h @@ -46,7 +46,7 @@ #endif namespace ToonzExt { -class DVAPI NotSimmetricExpPotential : public Potential { +class DVAPI NotSimmetricExpPotential final : public Potential { public: virtual ~NotSimmetricExpPotential(); diff --git a/toonz/sources/include/ext/OverallDesigner.h b/toonz/sources/include/ext/OverallDesigner.h index 2e71db4..7bc3d34 100644 --- a/toonz/sources/include/ext/OverallDesigner.h +++ b/toonz/sources/include/ext/OverallDesigner.h @@ -23,7 +23,7 @@ #endif namespace ToonzExt { -class DVAPI OverallDesigner : public Designer { +class DVAPI OverallDesigner final : public Designer { int x_, y_; double scale_, pixelSize_; diff --git a/toonz/sources/include/ext/SmoothDeformation.h b/toonz/sources/include/ext/SmoothDeformation.h index 98d180c..aff27a5 100644 --- a/toonz/sources/include/ext/SmoothDeformation.h +++ b/toonz/sources/include/ext/SmoothDeformation.h @@ -25,7 +25,7 @@ #include "StrokeDeformationImpl.h" namespace ToonzExt { -class DVAPI SmoothDeformation : public StrokeDeformationImpl { +class DVAPI SmoothDeformation final : public StrokeDeformationImpl { SmoothDeformation(); public: diff --git a/toonz/sources/include/ext/SquarePotential.h b/toonz/sources/include/ext/SquarePotential.h index 9a7a18b..07b5067 100644 --- a/toonz/sources/include/ext/SquarePotential.h +++ b/toonz/sources/include/ext/SquarePotential.h @@ -23,7 +23,7 @@ #endif namespace ToonzExt { -class DVAPI SquarePotential : public Potential { +class DVAPI SquarePotential final : public Potential { public: virtual ~SquarePotential(); diff --git a/toonz/sources/include/ext/StraightCornerDeformation.h b/toonz/sources/include/ext/StraightCornerDeformation.h index 39b898b..b50dfd2 100644 --- a/toonz/sources/include/ext/StraightCornerDeformation.h +++ b/toonz/sources/include/ext/StraightCornerDeformation.h @@ -26,7 +26,7 @@ #include "StrokeDeformationImpl.h" namespace ToonzExt { -class DVAPI StraightCornerDeformation : public StrokeDeformationImpl { +class DVAPI StraightCornerDeformation final : public StrokeDeformationImpl { StraightCornerDeformation(); public: diff --git a/toonz/sources/include/ext/StrokeParametricDeformer.h b/toonz/sources/include/ext/StrokeParametricDeformer.h index 5b81e39..e2a253b 100644 --- a/toonz/sources/include/ext/StrokeParametricDeformer.h +++ b/toonz/sources/include/ext/StrokeParametricDeformer.h @@ -35,7 +35,7 @@ class Potential; * * New stroke deformer doesn't change last point of stroke. */ -class DVAPI StrokeParametricDeformer : public TStrokeDeformation { +class DVAPI StrokeParametricDeformer final : public TStrokeDeformation { public: StrokeParametricDeformer(double actionLenght, double startParameter, TStroke *s, Potential *); diff --git a/toonz/sources/include/ext/plasticskeleton.h b/toonz/sources/include/ext/plasticskeleton.h index 56a56ef..911f23c 100644 --- a/toonz/sources/include/ext/plasticskeleton.h +++ b/toonz/sources/include/ext/plasticskeleton.h @@ -56,8 +56,8 @@ class PlasticSkeletonDeformation; //************************************************************************************ //! PlasticSkeletonVertex is the vertex of a plastic skeleton object. -struct DVAPI PlasticSkeletonVertex : public tcg::Vertex, - public TPersist { +struct DVAPI PlasticSkeletonVertex final : public tcg::Vertex, + public TPersist { PERSIST_DECLARATION(PlasticSkeletonVertex) private: @@ -100,7 +100,7 @@ public: // PlasticSkeleton declaration //************************************************************************************ -class DVAPI PlasticSkeleton +class DVAPI PlasticSkeleton final : public TSmartObject, public tcg::Mesh>, public TPersist { diff --git a/toonz/sources/include/ext/plasticskeletondeformation.h b/toonz/sources/include/ext/plasticskeletondeformation.h index 53dcd9a..fbb62ff 100644 --- a/toonz/sources/include/ext/plasticskeletondeformation.h +++ b/toonz/sources/include/ext/plasticskeletondeformation.h @@ -44,7 +44,7 @@ class ParamChange; //************************************************************************************** //! The deformation of a plastic skeleton vertex. -typedef struct DVAPI PlasticSkeletonVertexDeformation : public TPersist { +typedef struct DVAPI PlasticSkeletonVertexDeformation final : public TPersist { PERSIST_DECLARATION(PlasticSkeletonVertexDeformation) public: @@ -154,7 +154,8 @@ of the skeletons it is attached to. It is therefore intended to be a \a container of said skeletons. */ -class DVAPI PlasticSkeletonDeformation : public TSmartObject, public TPersist { +class DVAPI PlasticSkeletonDeformation final : public TSmartObject, + public TPersist { DECLARE_CLASS_CODE PERSIST_DECLARATION(PlasticSkeletonDeformation) diff --git a/toonz/sources/include/qtofflinegl.h b/toonz/sources/include/qtofflinegl.h index 94e14b5..a52ad61 100644 --- a/toonz/sources/include/qtofflinegl.h +++ b/toonz/sources/include/qtofflinegl.h @@ -13,7 +13,7 @@ #include "tofflinegl.h" -class QtOfflineGL : public TOfflineGL::Imp { +class QtOfflineGL final : public TOfflineGL::Imp { public: std::shared_ptr m_context; std::shared_ptr m_oldContext; @@ -36,7 +36,7 @@ public: //----------------------------------------------------------------------------- -class QtOfflineGLPBuffer : public TOfflineGL::Imp { +class QtOfflineGLPBuffer final : public TOfflineGL::Imp { public: std::shared_ptr m_context; diff --git a/toonz/sources/include/stdfx/shaderinterface.h b/toonz/sources/include/stdfx/shaderinterface.h index 4fe7b1e..f52214b 100644 --- a/toonz/sources/include/stdfx/shaderinterface.h +++ b/toonz/sources/include/stdfx/shaderinterface.h @@ -68,7 +68,7 @@ class QGLShaderProgram; A loaded ShaderInterface allows access to shader parameters and acts as a factory object to compiled QGLShaderProgram instances. */ -class DVAPI ShaderInterface : public TPersist { +class DVAPI ShaderInterface final : public TPersist { public: // Enums enum ParameterConceptType { CONCEPT_NONE, @@ -110,7 +110,7 @@ public: // Enums enum HandledWorldTransformsType { HWT_UNKNOWN, ANY, ISOTROPIC, HWTCOUNT }; public: // Sub-classes - class ParameterConcept : public TPersist { + class ParameterConcept final : public TPersist { PERSIST_DECLARATION(ParameterConcept) public: @@ -147,7 +147,7 @@ public: // Sub-classes GLubyte m_rgb[3]; }; - class Parameter : public TPersist { + class Parameter final : public TPersist { PERSIST_DECLARATION(Parameter) public: @@ -169,7 +169,7 @@ public: // Sub-classes void loadData(TIStream &is) override; }; - class ShaderData : public TPersist { + class ShaderData final : public TPersist { PERSIST_DECLARATION(ShaderData) public: diff --git a/toonz/sources/include/t32bitsrv_wrap.h b/toonz/sources/include/t32bitsrv_wrap.h index 06dc74b..3b88efc 100644 --- a/toonz/sources/include/t32bitsrv_wrap.h +++ b/toonz/sources/include/t32bitsrv_wrap.h @@ -58,8 +58,8 @@ static QString srvCmdline() { // Buffer data exchanger //************************************************************************************* -class DVAPI BufferExchanger : public tipc::ShMemReader, - public tipc::ShMemWriter { +class DVAPI BufferExchanger final : public tipc::ShMemReader, + public tipc::ShMemWriter { UCHAR *m_buf; UCHAR *m_data; @@ -78,8 +78,8 @@ public: //************************************************************************************* template -class DVAPI RasterExchanger : public tipc::ShMemReader, - public tipc::ShMemWriter { +class DVAPI RasterExchanger final : public tipc::ShMemReader, + public tipc::ShMemWriter { typedef PIXEL pix_type; TRasterPT m_ras; diff --git a/toonz/sources/include/tcachedlevel.h b/toonz/sources/include/tcachedlevel.h index f1f0932..0c61d38 100644 --- a/toonz/sources/include/tcachedlevel.h +++ b/toonz/sources/include/tcachedlevel.h @@ -61,14 +61,14 @@ protected: }; -class TRamCache : public TCache { +class TRamCache final : public TCache { public: TRamCache(); }; -class TDiskCache : public TCache { +class TDiskCache final : public TCache { public: TDiskCache(); }; @@ -83,18 +83,18 @@ void TDiskCache::getRaster( -class TRAMUncompressedCache : public TRamCache { +class TRAMUncompressedCache final : public TRamCache { }; -class TRAMLzoCache : public TRamCache { +class TRAMLzoCache final : public TRamCache { }; -class TDiskUncompressedCache : public TDiskCache { +class TDiskUncompressedCache final : public TDiskCache { }; -class TDiskYUV422Cache : public TDiskCache { +class TDiskYUV422Cache final : public TDiskCache { public: TDiskYUV422Cache(); ~TDiskYUV422Cache(); @@ -186,7 +186,7 @@ public: TRasterCodec *m_codec; }; -class DVAPI TRamCachePersist : public TCachePersist { +class DVAPI TRamCachePersist final : public TCachePersist { public: TRamCachePersist(TRasterCodec *codec); ~TRamCachePersist(); @@ -213,7 +213,7 @@ private: //------------------------------------------------------------------------------ -class DVAPI TDiskCachePersist : public TCachePersist { +class DVAPI TDiskCachePersist final : public TCachePersist { public: TDiskCachePersist(TRasterCodec *codec, const TFilePath &fullpath); ~TDiskCachePersist(); @@ -241,7 +241,7 @@ private: //------------------------------------------------------------------------------ // TDiskCachePersist2 usa il Direct File I/O (acceso al disco non bufferizzato) -class DVAPI TDiskCachePersist2 : public TCachePersist { +class DVAPI TDiskCachePersist2 final : public TCachePersist { public: TDiskCachePersist2(TRasterCodec *codec, const TFilePath &fullpath); ~TDiskCachePersist2(); diff --git a/toonz/sources/include/tcacheresourcepool.h b/toonz/sources/include/tcacheresourcepool.h index f91d778..0430cd2 100644 --- a/toonz/sources/include/tcacheresourcepool.h +++ b/toonz/sources/include/tcacheresourcepool.h @@ -30,7 +30,7 @@ class TFilePath; //============================================================================ -class DVAPI TCacheResourcePool : public QObject { +class DVAPI TCacheResourcePool final : public QObject { Q_OBJECT THDCacheResourcePool *m_hdPool; diff --git a/toonz/sources/include/tcli.h b/toonz/sources/include/tcli.h index 3a429f8..02f1796 100644 --- a/toonz/sources/include/tcli.h +++ b/toonz/sources/include/tcli.h @@ -128,7 +128,7 @@ public: //--------------------------------------------------------- -class DVAPI Switcher : public SimpleQualifier { +class DVAPI Switcher final : public SimpleQualifier { public: Switcher(std::string name, std::string help) : SimpleQualifier(name, help) { m_switcher = true; @@ -139,7 +139,7 @@ public: //--------------------------------------------------------- template -class QualifierT : public Qualifier { +class QualifierT final : public Qualifier { T m_value; public: @@ -183,7 +183,7 @@ public: //--------------------------------------------------------- template -class ArgumentT : public Argument { +class ArgumentT final : public Argument { T m_value; public: @@ -222,7 +222,7 @@ public: //--------------------------------------------------------- template -class MultiArgumentT : public MultiArgument { +class MultiArgumentT final : public MultiArgument { std::unique_ptr m_values; public: @@ -293,7 +293,7 @@ DVAPI UsageLine operator+(UsageElement &a, UsageElement &b); //--------------------------------------------------------- -class DVAPI Optional : public UsageLine { +class DVAPI Optional final : public UsageLine { public: Optional(const UsageLine &ul); ~Optional(){}; @@ -346,7 +346,7 @@ typedef MultiArgumentT FilePathMultiArgument; //========================================================= -class DVAPI RangeQualifier : public Qualifier { +class DVAPI RangeQualifier final : public Qualifier { int m_from, m_to; public: diff --git a/toonz/sources/include/tcodec.h b/toonz/sources/include/tcodec.h index 4e43a90..3548637 100644 --- a/toonz/sources/include/tcodec.h +++ b/toonz/sources/include/tcodec.h @@ -40,7 +40,7 @@ private: //------------------------------------------------------------------------------ -class DVAPI TRasterCodecDummy : public TRasterCodec { +class DVAPI TRasterCodecDummy final : public TRasterCodec { public: TRasterCodecDummy(const std::string &name) : TRasterCodec(name) {} ~TRasterCodecDummy() {} @@ -60,7 +60,7 @@ public: //------------------------------------------------------------------------------ -class DVAPI TRasterCodecQTL : public TRasterCodec { +class DVAPI TRasterCodecQTL final : public TRasterCodec { public: TRasterCodecQTL(const std::string &name) : TRasterCodec(name) {} ~TRasterCodecQTL() {} @@ -80,7 +80,7 @@ public: //------------------------------------------------------------------------------ -/*class DVAPI TRasterCodecSnappy : public TRasterCodec +/*class DVAPI TRasterCodecSnappy final : public TRasterCodec { public: @@ -133,7 +133,7 @@ private: //------------------------------------------------------------------------------ -class DVAPI TRasterCodecLZO : public TRasterCodec { +class DVAPI TRasterCodecLZO final : public TRasterCodec { public: TRasterCodecLZO(const std::string &name, bool useCache); ~TRasterCodecLZO(); diff --git a/toonz/sources/include/tcolorfunctions.h b/toonz/sources/include/tcolorfunctions.h index 7530e2d..4b68c5c 100644 --- a/toonz/sources/include/tcolorfunctions.h +++ b/toonz/sources/include/tcolorfunctions.h @@ -45,7 +45,7 @@ public: //----------------------------------------------------------------------------- -class DVAPI TGenericColorFunction : public TColorFunction { +class DVAPI TGenericColorFunction final : public TColorFunction { double m_m[4], m_c[4]; public: @@ -61,7 +61,7 @@ public: //----------------------------------------------------------------------------- -class DVAPI TColorFader : public TColorFunction { +class DVAPI TColorFader final : public TColorFunction { TPixel32 m_color; double m_fade; @@ -80,7 +80,7 @@ public: //----------------------------------------------------------------------------- -class DVAPI TOnionFader : public TColorFunction { +class DVAPI TOnionFader final : public TColorFunction { TPixel32 m_color; double m_fade; @@ -97,7 +97,7 @@ public: bool getParameters(Parameters &p) const override; }; -class DVAPI TTranspFader : public TColorFunction { +class DVAPI TTranspFader final : public TColorFunction { double m_transp; public: diff --git a/toonz/sources/include/tcurves.h b/toonz/sources/include/tcurves.h index 810b19a..61a1869 100644 --- a/toonz/sources/include/tcurves.h +++ b/toonz/sources/include/tcurves.h @@ -326,7 +326,7 @@ inline std::ostream &operator<<(std::ostream &out, const TCubic *curve) { TSegment Class to manage a segment with thickness \!relates TSegment */ -class DVAPI TThickSegment : public TSegment { +class DVAPI TThickSegment final : public TSegment { protected: double m_thickP0; double m_thickP1; @@ -413,7 +413,7 @@ inline std::ostream &operator<<(std::ostream &out, Class TThickQuadratic: manage a curve with thick \!relates TQuadratic */ -class DVAPI TThickQuadratic : public TQuadratic { +class DVAPI TThickQuadratic final : public TQuadratic { protected: double m_thickP0; double m_thickP1; @@ -501,7 +501,7 @@ inline std::ostream &operator<<(std::ostream &out, const TThickQuadratic *tq) { Class TThickCubic: manage a cubic with thick \!relates TCubic */ -class DVAPI TThickCubic : public TCubic { +class DVAPI TThickCubic final : public TCubic { protected: double m_thickP0; double m_thickP1; diff --git a/toonz/sources/include/tdata.h b/toonz/sources/include/tdata.h index a4315d9..8ffb4f5 100644 --- a/toonz/sources/include/tdata.h +++ b/toonz/sources/include/tdata.h @@ -38,7 +38,7 @@ public: //------------------------------------------------------------------- -class DVAPI TTextData : public TData { +class DVAPI TTextData final : public TData { TString m_text; public: @@ -57,7 +57,7 @@ public: #pragma warning(disable : 4251) #endif -class DVAPI TFilePathListData : public TData { +class DVAPI TFilePathListData final : public TData { std::vector m_filePaths; public: diff --git a/toonz/sources/include/tdoubleparam.h b/toonz/sources/include/tdoubleparam.h index fb75f0b..5fe50e5 100644 --- a/toonz/sources/include/tdoubleparam.h +++ b/toonz/sources/include/tdoubleparam.h @@ -51,7 +51,7 @@ template class DVAPI TPersistDeclarationT; // TDoubleParam declaration //************************************************************************** -class DVAPI TDoubleParam : public TParam { +class DVAPI TDoubleParam final : public TParam { PERSIST_DECLARATION(TDoubleParam) class Imp; diff --git a/toonz/sources/include/tdoubleparamrelayproperty.h b/toonz/sources/include/tdoubleparamrelayproperty.h index 100e75b..24f4f07 100644 --- a/toonz/sources/include/tdoubleparamrelayproperty.h +++ b/toonz/sources/include/tdoubleparamrelayproperty.h @@ -25,8 +25,8 @@ //! The TDoubleParamRelayProperty is a TProperty heir which can be used as //! intermediary between a TDoubleParam instance and its GUI viewers. -class DVAPI TDoubleParamRelayProperty : public TProperty, - public TParamObserver { +class DVAPI TDoubleParamRelayProperty final : public TProperty, + public TParamObserver { TDoubleParamP m_param; //!< The referenced param double m_frame; //!< Frame at which m_param returns values diff --git a/toonz/sources/include/tenv.h b/toonz/sources/include/tenv.h index 703861a..b0ab78e 100644 --- a/toonz/sources/include/tenv.h +++ b/toonz/sources/include/tenv.h @@ -40,7 +40,7 @@ public: void assignValue(std::string str); }; -class DVAPI IntVar : public Variable { +class DVAPI IntVar final : public Variable { public: IntVar(std::string name, int defValue); IntVar(std::string name); @@ -48,7 +48,7 @@ public: void operator=(int v); }; -class DVAPI DoubleVar : public Variable { +class DVAPI DoubleVar final : public Variable { public: DoubleVar(std::string name, double defValue); DoubleVar(std::string name); @@ -56,7 +56,7 @@ public: void operator=(double v); }; -class DVAPI StringVar : public Variable { +class DVAPI StringVar final : public Variable { public: StringVar(std::string name, const std::string &defValue); StringVar(std::string name); @@ -64,7 +64,7 @@ public: void operator=(const std::string &v); }; -class DVAPI FilePathVar : public Variable { +class DVAPI FilePathVar final : public Variable { public: FilePathVar(std::string name, const TFilePath &defValue); FilePathVar(std::string name); @@ -72,7 +72,7 @@ public: void operator=(const TFilePath &v); }; -class DVAPI RectVar : public Variable { +class DVAPI RectVar final : public Variable { public: RectVar(std::string name, const TRect &defValue); RectVar(std::string name); diff --git a/toonz/sources/include/texternfx.h b/toonz/sources/include/texternfx.h index d202f65..31fc6a8 100644 --- a/toonz/sources/include/texternfx.h +++ b/toonz/sources/include/texternfx.h @@ -28,7 +28,7 @@ public: //--------------------------------------------------------- -class DVAPI TExternalProgramFx : public TExternFx { +class DVAPI TExternalProgramFx final : public TExternFx { FX_DECLARATION(TExternalProgramFx) class Port { diff --git a/toonz/sources/include/tfarmtask.h b/toonz/sources/include/tfarmtask.h index 9e0412e..ae7b709 100644 --- a/toonz/sources/include/tfarmtask.h +++ b/toonz/sources/include/tfarmtask.h @@ -144,7 +144,7 @@ public: //------------------------------------------------------------------------------ -class TFARMAPI TFarmTaskGroup : public TFarmTask { +class TFARMAPI TFarmTaskGroup final : public TFarmTask { public: TFarmTaskGroup(); diff --git a/toonz/sources/include/tfilepath.h b/toonz/sources/include/tfilepath.h index 14326ec..ee04a45 100644 --- a/toonz/sources/include/tfilepath.h +++ b/toonz/sources/include/tfilepath.h @@ -245,7 +245,7 @@ type is a string that indicate the filename extension(ex:. bmp or .bmp)*/ //----------------------------------------------------------------------------- -class TMalformedFrameException : public TException { +class TMalformedFrameException final : public TException { public: TMalformedFrameException(const TFilePath &fp, const std::wstring &msg = std::wstring()) diff --git a/toonz/sources/include/tfilepath_io.h b/toonz/sources/include/tfilepath_io.h index 7d8078c..7c90481 100644 --- a/toonz/sources/include/tfilepath_io.h +++ b/toonz/sources/include/tfilepath_io.h @@ -59,7 +59,7 @@ DVAPI FILE *fopen(const TFilePath &fp, std::string mode); -class DVAPI Tifstream : public std::ifstream { +class DVAPI Tifstream final : public std::ifstream { FILE *m_file; public: diff --git a/toonz/sources/include/tflash.h b/toonz/sources/include/tflash.h index 608a296..15ef866 100644 --- a/toonz/sources/include/tflash.h +++ b/toonz/sources/include/tflash.h @@ -34,7 +34,7 @@ class TColorFunction; namespace Tiio { -class SwfWriterProperties : public TPropertyGroup { +class SwfWriterProperties final : public TPropertyGroup { public: TEnumProperty m_lineQuality; TBoolProperty m_isCompressed; diff --git a/toonz/sources/include/tfont.h b/toonz/sources/include/tfont.h index 2fd180f..8853424 100644 --- a/toonz/sources/include/tfont.h +++ b/toonz/sources/include/tfont.h @@ -93,14 +93,14 @@ private: //----------------------------------------------------------------------------- -class TFontCreationError : public TException { +class TFontCreationError final : public TException { public: TFontCreationError() : TException("E_CanNotUseSelectedFont") {} }; //----------------------------------------------------------------------------- -class TFontLibraryLoadingError : public TException { +class TFontLibraryLoadingError final : public TException { public: TFontLibraryLoadingError() : TException("E_CanNotLoadFonts") {} }; diff --git a/toonz/sources/include/tfunctorinvoker.h b/toonz/sources/include/tfunctorinvoker.h index 4cefdb7..e70c8cc 100644 --- a/toonz/sources/include/tfunctorinvoker.h +++ b/toonz/sources/include/tfunctorinvoker.h @@ -47,7 +47,7 @@ instance on the heap, The following code exemplifies a correct usage for this class: \n \code - class MyFunctor : public TFunctorInvoker::BaseFunctor + class MyFunctor final : public TFunctorInvoker::BaseFunctor { MyParams m_params; // Function parameters @@ -74,7 +74,7 @@ Qt::QueuedConnection, \endcode */ -class DVAPI TFunctorInvoker : public QObject { +class DVAPI TFunctorInvoker final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/include/tfx.h b/toonz/sources/include/tfx.h index 7ac2511..fe2b81b 100644 --- a/toonz/sources/include/tfx.h +++ b/toonz/sources/include/tfx.h @@ -250,7 +250,7 @@ private: //------------------------------------------------------------------------------ -class TFxParamChange : public TFxChange { +class TFxParamChange final : public TFxChange { public: TFxParamChange(TFx *fx, double firstAffectedFrame, double lastAffectedFrame, bool dragging); @@ -259,7 +259,7 @@ public: //------------------------------------------------------------------------------ -class TFxPortAdded : public TFxChange { +class TFxPortAdded final : public TFxChange { public: TFxPortAdded(TFx *fx) : TFxChange(fx, m_minFrame, m_maxFrame, false) {} ~TFxPortAdded() {} @@ -267,7 +267,7 @@ public: //------------------------------------------------------------------------------ -class TFxPortRemoved : public TFxChange { +class TFxPortRemoved final : public TFxChange { public: TFxPortRemoved(TFx *fx) : TFxChange(fx, m_minFrame, m_maxFrame, false) {} ~TFxPortRemoved() {} @@ -275,7 +275,7 @@ public: //------------------------------------------------------------------------------ -class TFxParamAdded : public TFxChange { +class TFxParamAdded final : public TFxChange { public: TFxParamAdded(TFx *fx) : TFxChange(fx, m_minFrame, m_maxFrame, false) {} ~TFxParamAdded() {} @@ -283,7 +283,7 @@ public: //------------------------------------------------------------------------------ -class TFxParamRemoved : public TFxChange { +class TFxParamRemoved final : public TFxChange { public: TFxParamRemoved(TFx *fx) : TFxChange(fx, m_minFrame, m_maxFrame, false) {} ~TFxParamRemoved() {} @@ -291,7 +291,7 @@ public: //------------------------------------------------------------------------------ -class TFxParamsUnlinked : public TFxChange { +class TFxParamsUnlinked final : public TFxChange { public: TFxParamsUnlinked(TFx *fx) : TFxChange(fx, m_minFrame, m_maxFrame, false) {} ~TFxParamsUnlinked() {} @@ -526,7 +526,7 @@ public: }; template -class TFxDeclarationT : public TFxDeclaration { +class TFxDeclarationT final : public TFxDeclaration { public: TFxDeclarationT(const TFxInfo &info) : TFxDeclaration(info) {} TPersist *create() const override { return new T; } diff --git a/toonz/sources/include/tfxcachemanager.h b/toonz/sources/include/tfxcachemanager.h index f5f40fd..280be3e 100644 --- a/toonz/sources/include/tfxcachemanager.h +++ b/toonz/sources/include/tfxcachemanager.h @@ -200,7 +200,7 @@ predictive purposes. classes */ -class DVAPI TFxCacheManager : public TRenderResourceManager { +class DVAPI TFxCacheManager final : public TRenderResourceManager { T_RENDER_RESOURCE_MANAGER private: diff --git a/toonz/sources/include/tgeometry.h b/toonz/sources/include/tgeometry.h index 1166b32..f5653a7 100644 --- a/toonz/sources/include/tgeometry.h +++ b/toonz/sources/include/tgeometry.h @@ -363,7 +363,7 @@ inline T3DPointT cross(const T3DPointT &a, const T3DPointT &b) { TThickPoint describe a thick point. \relates TThickQuadratic, TThickCubic */ -class DVAPI TThickPoint : public TPointD { +class DVAPI TThickPoint final : public TPointD { public: double thick; @@ -1071,7 +1071,7 @@ const TAffine AffI = TAffine(); //----------------------------------------------------------------------------- -class DVAPI TTranslation : public TAffine { +class DVAPI TTranslation final : public TAffine { public: TTranslation(){}; TTranslation(double x, double y) : TAffine(1, 0, x, 0, 1, y){}; @@ -1080,7 +1080,7 @@ public: //----------------------------------------------------------------------------- -class DVAPI TRotation : public TAffine { +class DVAPI TRotation final : public TAffine { public: TRotation(){}; @@ -1130,7 +1130,7 @@ a21 = a.a21; a22 = a.a22; a23 = a.a23; //----------------------------------------------------------------------------- -class DVAPI TScale : public TAffine { +class DVAPI TScale final : public TAffine { public: TScale(){}; TScale(double sx, double sy) : TAffine(sx, 0, 0, 0, sy, 0){}; @@ -1157,7 +1157,7 @@ a21 = a.a21; a22 = a.a22; a23 = a.a23; //----------------------------------------------------------------------------- -class DVAPI TShear : public TAffine { +class DVAPI TShear final : public TAffine { public: TShear(){}; TShear(double sx, double sy) : TAffine(1, sx, 0, sy, 1, 0){}; diff --git a/toonz/sources/include/tgldisplaylistsmanager.h b/toonz/sources/include/tgldisplaylistsmanager.h index 0054b1d..021ab0d 100644 --- a/toonz/sources/include/tgldisplaylistsmanager.h +++ b/toonz/sources/include/tgldisplaylistsmanager.h @@ -57,7 +57,7 @@ public: //************************************************************************************************** template -class TGLDisplayListsProxyT : public TGLDisplayListsProxy { +class TGLDisplayListsProxyT final : public TGLDisplayListsProxy { Context *m_proxy; public: @@ -113,7 +113,7 @@ handled by display lists id. */ -class DVAPI TGLDisplayListsManager : public tcg::notifier<> { +class DVAPI TGLDisplayListsManager final : public tcg::notifier<> { public: struct Observer : public tcg::observer { virtual void onDisplayListDestroyed(int dlSpaceId) = 0; diff --git a/toonz/sources/include/tgrammar.h b/toonz/sources/include/tgrammar.h index 172a4c7..4819190 100644 --- a/toonz/sources/include/tgrammar.h +++ b/toonz/sources/include/tgrammar.h @@ -107,7 +107,7 @@ private: //------------------------------------------------------------------- -class DVAPI NumberNode : public CalculatorNode { +class DVAPI NumberNode final : public CalculatorNode { double m_value; public: @@ -121,7 +121,7 @@ public: //------------------------------------------------------------------- -class DVAPI VariableNode : public CalculatorNode { +class DVAPI VariableNode final : public CalculatorNode { int m_varIdx; public: diff --git a/toonz/sources/include/tiio_bmp.h b/toonz/sources/include/tiio_bmp.h index 4997f04..5afa960 100644 --- a/toonz/sources/include/tiio_bmp.h +++ b/toonz/sources/include/tiio_bmp.h @@ -20,7 +20,7 @@ DVAPI Tiio::WriterMaker makeBmpWriter; // DVAPI TPropertyGroup *makeBmpWriterProperties(); -class BmpWriterProperties : public TPropertyGroup { +class BmpWriterProperties final : public TPropertyGroup { public: TEnumProperty m_pixelSize; // TBoolProperty m_compressed; diff --git a/toonz/sources/include/tiio_jpg.h b/toonz/sources/include/tiio_jpg.h index dbb46d9..bd812fa 100644 --- a/toonz/sources/include/tiio_jpg.h +++ b/toonz/sources/include/tiio_jpg.h @@ -26,7 +26,7 @@ extern "C" { namespace Tiio { -class DVAPI JpgReader : public Tiio::Reader { +class DVAPI JpgReader final : public Tiio::Reader { struct jpeg_decompress_struct m_cinfo; struct jpeg_error_mgr m_jerr; FILE *m_chan; @@ -48,7 +48,7 @@ public: DVAPI Tiio::ReaderMaker makeJpgReader; DVAPI Tiio::WriterMaker makeJpgWriter; -class DVAPI JpgWriterProperties : public TPropertyGroup { +class DVAPI JpgWriterProperties final : public TPropertyGroup { public: TIntProperty m_quality; TIntProperty m_smoothing; diff --git a/toonz/sources/include/timage_io.h b/toonz/sources/include/timage_io.h index ebf01e1..d6b99d0 100644 --- a/toonz/sources/include/timage_io.h +++ b/toonz/sources/include/timage_io.h @@ -34,7 +34,7 @@ class TImageInfo; //=========================================================== -class DVAPI TImageException : public TException { +class DVAPI TImageException final : public TException { TFilePath m_fp; public: @@ -48,7 +48,7 @@ public: //=========================================================== -class DVAPI TImageVersionException : public TException { +class DVAPI TImageVersionException final : public TException { TFilePath m_fp; int m_major, m_minor; @@ -182,7 +182,7 @@ Region dimension doesn't consider shrink template class DVAPI TSmartPointerT; #endif -class DVAPI TImageReaderP : public TSmartPointerT { +class DVAPI TImageReaderP final : public TSmartPointerT { public: TImageReaderP(TImageReader *ir) : TSmartPointerT(ir){}; // il costruttore "non banale" @@ -245,7 +245,7 @@ public: template class DVAPI TSmartPointerT; #endif -class DVAPI TImageWriterP : public TSmartPointerT { +class DVAPI TImageWriterP final : public TSmartPointerT { public: TImageWriterP(TImageWriter *iw) : TSmartPointerT(iw){}; // il costruttore "non banale" diff --git a/toonz/sources/include/timagecache.h b/toonz/sources/include/timagecache.h index 01a92c6..5e22fb7 100644 --- a/toonz/sources/include/timagecache.h +++ b/toonz/sources/include/timagecache.h @@ -170,7 +170,7 @@ private: //! The TCachedImage class implements a shared reference to an image that is //! stored under TImageCache. -class DVAPI TCachedImage : public TSmartObject { +class DVAPI TCachedImage final : public TSmartObject { DECLARE_CLASS_CODE std::string m_ref; diff --git a/toonz/sources/include/tipc.h b/toonz/sources/include/tipc.h index b2deb31..885f8b5 100644 --- a/toonz/sources/include/tipc.h +++ b/toonz/sources/include/tipc.h @@ -122,7 +122,7 @@ public: A tipc::Stream is a specialized QDataStream designed to work with a tipc-based QLocalSocket instance. */ -class DVAPI Stream : public QDataStream { +class DVAPI Stream final : public QDataStream { QLocalSocket *m_socket; public: diff --git a/toonz/sources/include/tipcmsg.h b/toonz/sources/include/tipcmsg.h index 0088e78..fff0f32 100644 --- a/toonz/sources/include/tipcmsg.h +++ b/toonz/sources/include/tipcmsg.h @@ -55,7 +55,7 @@ enum DefMsgEnum { }; template -class DVAPI DefaultMessageParser : public MessageParser { +class DVAPI DefaultMessageParser final : public MessageParser { public: QString header() const override; void operator()(Message &msg) override; diff --git a/toonz/sources/include/tipcsrv.h b/toonz/sources/include/tipcsrv.h index 6fb604e..ce52ad0 100644 --- a/toonz/sources/include/tipcsrv.h +++ b/toonz/sources/include/tipcsrv.h @@ -44,7 +44,7 @@ class MessageParser; associations to perform message parsing. */ -class DVAPI Server : public QLocalServer { +class DVAPI Server final : public QLocalServer { Q_OBJECT QHash m_parsers; diff --git a/toonz/sources/include/tipcsrvP.h b/toonz/sources/include/tipcsrvP.h index 514736e..0216ce7 100644 --- a/toonz/sources/include/tipcsrvP.h +++ b/toonz/sources/include/tipcsrvP.h @@ -16,7 +16,7 @@ class Server; //------------------------------------------------------------------ -class SocketController : public QObject { +class SocketController final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/include/tlevel.h b/toonz/sources/include/tlevel.h index ecf9850..08924c3 100644 --- a/toonz/sources/include/tlevel.h +++ b/toonz/sources/include/tlevel.h @@ -18,7 +18,7 @@ //------------------------------------------------------------------- -class DVAPI TLevel : public TSmartObject { +class DVAPI TLevel final : public TSmartObject { DECLARE_CLASS_CODE public: @@ -74,7 +74,7 @@ public: template class DVAPI TSmartPointerT; #endif -class DVAPI TLevelP : public TSmartPointerT { +class DVAPI TLevelP final : public TSmartPointerT { public: TLevelP() : TSmartPointerT(new TLevel) {} TLevelP(TLevel *level) : TSmartPointerT(level) {} diff --git a/toonz/sources/include/tlevel_io.h b/toonz/sources/include/tlevel_io.h index a12d590..4713788 100644 --- a/toonz/sources/include/tlevel_io.h +++ b/toonz/sources/include/tlevel_io.h @@ -106,7 +106,7 @@ private: template class DVAPI TSmartPointerT; #endif -class DVAPI TLevelReaderP : public TSmartPointerT { +class DVAPI TLevelReaderP final : public TSmartPointerT { public: // il costruttore "non banale" TLevelReaderP(const TFilePath &filepath, int reader = 0); @@ -211,7 +211,7 @@ public: template class DVAPI TSmartPointerT; #endif -class DVAPI TLevelWriterP : public TSmartPointerT { +class DVAPI TLevelWriterP final : public TSmartPointerT { public: // il costruttore "non banale" TLevelWriterP(const TFilePath &filepath, diff --git a/toonz/sources/include/tmacrofx.h b/toonz/sources/include/tmacrofx.h index 5297ed7..c2a12e8 100644 --- a/toonz/sources/include/tmacrofx.h +++ b/toonz/sources/include/tmacrofx.h @@ -21,7 +21,7 @@ //=================================================================== -class DVAPI TMacroFx : public TRasterFx { +class DVAPI TMacroFx final : public TRasterFx { FX_DECLARATION(TMacroFx) TRasterFxP m_root; diff --git a/toonz/sources/include/tmathutil.h b/toonz/sources/include/tmathutil.h index ca59dc9..6a2e5a7 100644 --- a/toonz/sources/include/tmathutil.h +++ b/toonz/sources/include/tmathutil.h @@ -28,7 +28,7 @@ enum TMathError { INFINITE_SOLUTIONS = -1 }; //----------------------------------------------------------------------------- -class DVAPI TMathException : public TException { +class DVAPI TMathException final : public TException { TString m_msg; public: diff --git a/toonz/sources/include/tmeshimage.h b/toonz/sources/include/tmeshimage.h index 0332c15..ff4775c 100644 --- a/toonz/sources/include/tmeshimage.h +++ b/toonz/sources/include/tmeshimage.h @@ -39,7 +39,7 @@ // TTextureVertex (Textured Mesh Vertex Type) declaration //*********************************************************************************** -struct RigidPoint : public TPointD { +struct RigidPoint final : public TPointD { double rigidity; public: @@ -115,7 +115,7 @@ struct point_traits { // TTextureMesh (Textured Mesh Type) declaration //*********************************************************************************** -class DVAPI TTextureMesh +class DVAPI TTextureMesh final : public tcg::TriMesh>, public TSmartObject, public TPersist { @@ -150,7 +150,7 @@ typedef TSmartPointerT TTextureMeshP; namespace boost { template <> -struct graph_traits +struct graph_traits final : public graph_traits< tcg::Mesh> {}; @@ -161,7 +161,7 @@ struct graph_traits // TMeshImage (Textured Mesh Image) declaration //*********************************************************************************** -class DVAPI TMeshImage : public TImage { +class DVAPI TMeshImage final : public TImage { class Imp; std::shared_ptr m_imp; @@ -199,7 +199,8 @@ template class DVAPI TSmartPointerT; template class DVAPI TDerivedSmartPointerT; #endif -class DVAPI TMeshImageP : public TDerivedSmartPointerT { +class DVAPI TMeshImageP final + : public TDerivedSmartPointerT { public: TMeshImageP() {} TMeshImageP(TMeshImage *image) : DerivedSmartPointer(image) {} diff --git a/toonz/sources/include/tmsgcore.h b/toonz/sources/include/tmsgcore.h index 1dbc881..eb606d3 100644 --- a/toonz/sources/include/tmsgcore.h +++ b/toonz/sources/include/tmsgcore.h @@ -38,7 +38,7 @@ void DVAPI warning(const QString &msg); void DVAPI info(const QString &msg); }; -class DVAPI TMsgCore : public QObject { +class DVAPI TMsgCore final : public QObject { Q_OBJECT QTcpServer *m_tcpServer; diff --git a/toonz/sources/include/tnotanimatableparam.h b/toonz/sources/include/tnotanimatableparam.h index 246baed..5094363 100644 --- a/toonz/sources/include/tnotanimatableparam.h +++ b/toonz/sources/include/tnotanimatableparam.h @@ -34,7 +34,7 @@ #endif template -class TNotAnimatableParamChange : public TParamChange { +class TNotAnimatableParamChange final : public TParamChange { T m_oldValue; T m_newValue; @@ -57,7 +57,7 @@ public: //----------------------------------------------------------------------------- template -class TNotAnimatableParamChangeUndo : public TUndo { +class TNotAnimatableParamChangeUndo final : public TUndo { public: TNotAnimatableParamChangeUndo(TParam *param, const T &oldValue, const T &newValue); @@ -187,7 +187,7 @@ class TIntParam; template class DVAPI TPersistDeclarationT; #endif -class DVAPI TIntParam : public TNotAnimatableParam { +class DVAPI TIntParam final : public TNotAnimatableParam { PERSIST_DECLARATION(TIntParam); int minValue, maxValue; bool m_isWheelEnabled; @@ -223,7 +223,7 @@ class TBoolParam; template class DVAPI TPersistDeclarationT; #endif -class DVAPI TBoolParam : public TNotAnimatableParam { +class DVAPI TBoolParam final : public TNotAnimatableParam { PERSIST_DECLARATION(TBoolParam); public: @@ -250,7 +250,7 @@ class TFilePathParam; template class DVAPI TPersistDeclarationT; #endif -class DVAPI TFilePathParam : public TNotAnimatableParam { +class DVAPI TFilePathParam final : public TNotAnimatableParam { PERSIST_DECLARATION(TFilePathParam); public: @@ -277,7 +277,7 @@ class TStringParam; template class DVAPI TPersistDeclarationT; #endif -class DVAPI TStringParam : public TNotAnimatableParam { +class DVAPI TStringParam final : public TNotAnimatableParam { PERSIST_DECLARATION(TStringParam); public: @@ -299,7 +299,7 @@ DEFINE_PARAM_SMARTPOINTER(TStringParam, std::wstring) class TEnumParamImp; -class DVAPI TEnumParam : public TNotAnimatableParam { +class DVAPI TEnumParam final : public TNotAnimatableParam { PERSIST_DECLARATION(TEnumParam) public: @@ -335,7 +335,7 @@ typedef TNotAnimatableParamObserver TIntEnumParamObserver; DVAPI_PARAM_SMARTPOINTER(TIntEnumParam) -class DVAPI TIntEnumParamP +class DVAPI TIntEnumParamP final : public TDerivedSmartPointerT { public: TIntEnumParamP(TIntEnumParam *p = 0) : DerivedSmartPointer(p) {} @@ -360,7 +360,7 @@ class TNADoubleParam; template class DVAPI TPersistDeclarationT; #endif -class DVAPI TNADoubleParam : public TNotAnimatableParam { +class DVAPI TNADoubleParam final : public TNotAnimatableParam { PERSIST_DECLARATION(TNADoubleParam); public: diff --git a/toonz/sources/include/tools/imagegrouping.h b/toonz/sources/include/tools/imagegrouping.h index b88dd78..4e69256 100644 --- a/toonz/sources/include/tools/imagegrouping.h +++ b/toonz/sources/include/tools/imagegrouping.h @@ -19,7 +19,7 @@ class QMenu; #define DVVAR DV_IMPORT_VAR #endif -class DVAPI TGroupCommand : public QObject { +class DVAPI TGroupCommand final : public QObject { Q_OBJECT public: enum { diff --git a/toonz/sources/include/tools/rasterselection.h b/toonz/sources/include/tools/rasterselection.h index b0465f2..40a1513 100644 --- a/toonz/sources/include/tools/rasterselection.h +++ b/toonz/sources/include/tools/rasterselection.h @@ -38,7 +38,7 @@ class RasterImageData; //! Selection of TToonzImage and TRasterImage. //----------------------------------------------------------------------------- -class DVAPI RasterSelection : public TSelection { +class DVAPI RasterSelection final : public TSelection { TImageP m_currentImage; TXshCell m_currentImageCell; diff --git a/toonz/sources/include/tools/screenpicker.h b/toonz/sources/include/tools/screenpicker.h index 52e2d4d..dd9b409 100644 --- a/toonz/sources/include/tools/screenpicker.h +++ b/toonz/sources/include/tools/screenpicker.h @@ -9,7 +9,7 @@ //---------------------------------------------------------------------- -class ScreenPicker : public QObject, public DVGui::ScreenBoard::Drawing { +class ScreenPicker final : public QObject, public DVGui::ScreenBoard::Drawing { Q_OBJECT QPoint m_start; diff --git a/toonz/sources/include/tools/strokeselection.h b/toonz/sources/include/tools/strokeselection.h index 45efa74..02d371f 100644 --- a/toonz/sources/include/tools/strokeselection.h +++ b/toonz/sources/include/tools/strokeselection.h @@ -38,7 +38,7 @@ class TSceneHandle; // StrokeSelection declaration //**************************************************************************** -class DVAPI StrokeSelection : public TSelection { +class DVAPI StrokeSelection final : public TSelection { public: typedef std::set IndexesContainer; diff --git a/toonz/sources/include/tools/toolhandle.h b/toonz/sources/include/tools/toolhandle.h index 6baeb3b..e11af61 100644 --- a/toonz/sources/include/tools/toolhandle.h +++ b/toonz/sources/include/tools/toolhandle.h @@ -28,7 +28,7 @@ class QString; // ToolHandle //----------------------------------------------------------------------------- -class DVAPI ToolHandle : public QObject { +class DVAPI ToolHandle final : public QObject { Q_OBJECT TTool *m_tool; diff --git a/toonz/sources/include/tools/tooloptions.h b/toonz/sources/include/tools/tooloptions.h index 7aa6e50..b06a86d 100644 --- a/toonz/sources/include/tools/tooloptions.h +++ b/toonz/sources/include/tools/tooloptions.h @@ -84,7 +84,7 @@ class QStackedWidget; // ToolOptionToolBar declaration //*********************************************************************************************** -class ToolOptionToolBar : public QToolBar { +class ToolOptionToolBar final : public QToolBar { public: ToolOptionToolBar(QWidget *parent = 0); @@ -127,7 +127,7 @@ public: // ToolOptionControlBuilder declaration //*********************************************************************************************** -class ToolOptionControlBuilder : public TProperty::Visitor { +class ToolOptionControlBuilder final : public TProperty::Visitor { ToolOptionsBox *m_panel; TTool *m_tool; TPaletteHandle *m_pltHandle; @@ -178,7 +178,7 @@ public: // //============================================================================= -class ArrowToolOptionsBox : public ToolOptionsBox { +class ArrowToolOptionsBox final : public ToolOptionsBox { Q_OBJECT TPropertyGroup *m_pg; @@ -267,38 +267,51 @@ protected slots: // //============================================================================= -class IconViewField : public QWidget { +class IconViewField final : public QWidget { Q_OBJECT public: - enum IconType{ + enum IconType { Icon_ScalePeg = 0, Icon_Rotation, Icon_Position, Icon_Thickness, Icon_Amount }; + private: IconType m_iconType; protected: QPixmap m_pm[Icon_Amount]; - Q_PROPERTY(QPixmap ScalePegPixmap READ getScalePegPixmap WRITE setScalePegPixmap); - Q_PROPERTY(QPixmap RotationPixmap READ getRotationPixmap WRITE setRotationPixmap); - Q_PROPERTY(QPixmap PositionPixmap READ getPositionPixmap WRITE setPositionPixmap); - Q_PROPERTY(QPixmap ThicknessPixmap READ getThicknessPixmap WRITE setThicknessPixmap); + Q_PROPERTY( + QPixmap ScalePegPixmap READ getScalePegPixmap WRITE setScalePegPixmap); + Q_PROPERTY( + QPixmap RotationPixmap READ getRotationPixmap WRITE setRotationPixmap); + Q_PROPERTY( + QPixmap PositionPixmap READ getPositionPixmap WRITE setPositionPixmap); + Q_PROPERTY( + QPixmap ThicknessPixmap READ getThicknessPixmap WRITE setThicknessPixmap); public: IconViewField(QWidget *parent = 0, IconType iconType = Icon_ScalePeg); QPixmap getScalePegPixmap() const { return m_pm[Icon_ScalePeg]; } - void setScalePegPixmap(const QPixmap &pixmap) { m_pm[Icon_ScalePeg] = pixmap; } + void setScalePegPixmap(const QPixmap &pixmap) { + m_pm[Icon_ScalePeg] = pixmap; + } QPixmap getRotationPixmap() const { return m_pm[Icon_Rotation]; } - void setRotationPixmap(const QPixmap &pixmap) { m_pm[Icon_Rotation] = pixmap; } + void setRotationPixmap(const QPixmap &pixmap) { + m_pm[Icon_Rotation] = pixmap; + } QPixmap getPositionPixmap() const { return m_pm[Icon_Position]; } - void setPositionPixmap(const QPixmap &pixmap) { m_pm[Icon_Position] = pixmap; } + void setPositionPixmap(const QPixmap &pixmap) { + m_pm[Icon_Position] = pixmap; + } QPixmap getThicknessPixmap() const { return m_pm[Icon_Thickness]; } - void setThicknessPixmap(const QPixmap &pixmap) { m_pm[Icon_Thickness] = pixmap; } + void setThicknessPixmap(const QPixmap &pixmap) { + m_pm[Icon_Thickness] = pixmap; + } protected: void paintEvent(QPaintEvent *e); @@ -306,8 +319,8 @@ protected: //----------------------------------------------------------------------------- -class SelectionToolOptionsBox : public ToolOptionsBox, - public TProperty::Listener { +class SelectionToolOptionsBox final : public ToolOptionsBox, + public TProperty::Listener { Q_OBJECT TTool *m_tool; @@ -337,7 +350,7 @@ public: void updateStatus(); void onPropertyChanged(); - protected slots: +protected slots: void onScaleXValueChanged(); void onScaleYValueChanged(); void onSetSaveboxCheckboxChanged(bool); @@ -349,7 +362,7 @@ public: // //============================================================================= -class GeometricToolOptionsBox : public ToolOptionsBox { +class GeometricToolOptionsBox final : public ToolOptionsBox { Q_OBJECT int m_targetType; @@ -379,7 +392,7 @@ protected slots: // //============================================================================= -class TypeToolOptionsBox : public ToolOptionsBox { +class TypeToolOptionsBox final : public ToolOptionsBox { Q_OBJECT TTool *m_tool; @@ -400,7 +413,7 @@ protected slots: // //============================================================================= -class PaintbrushToolOptionsBox : public ToolOptionsBox { +class PaintbrushToolOptionsBox final : public ToolOptionsBox { Q_OBJECT ToolOptionCombo *m_colorMode; @@ -422,7 +435,7 @@ protected slots: // //============================================================================= -class FillToolOptionsBox : public ToolOptionsBox { +class FillToolOptionsBox final : public ToolOptionsBox { Q_OBJECT int m_targetType; @@ -451,7 +464,7 @@ protected slots: // //============================================================================= -class BrushToolOptionsBox : public ToolOptionsBox { +class BrushToolOptionsBox final : public ToolOptionsBox { Q_OBJECT TTool *m_tool; @@ -488,7 +501,7 @@ protected slots: // //============================================================================= -class EraserToolOptionsBox : public ToolOptionsBox { +class EraserToolOptionsBox final : public ToolOptionsBox { Q_OBJECT ToolOptionCheckbox *m_pencilMode, *m_invertMode, *m_multiFrameMode; @@ -514,7 +527,7 @@ protected slots: // //============================================================================= -class RulerToolOptionsBox : public ToolOptionsBox { +class RulerToolOptionsBox final : public ToolOptionsBox { Q_OBJECT MeasuredValueField *m_Xfld; @@ -547,7 +560,7 @@ public: // //============================================================================= -class TapeToolOptionsBox : public ToolOptionsBox { +class TapeToolOptionsBox final : public ToolOptionsBox { Q_OBJECT ToolOptionCheckbox *m_smoothMode, *m_joinStrokesMode; @@ -573,7 +586,7 @@ protected slots: // //============================================================================= -class RGBPickerToolOptionsBox : public ToolOptionsBox { +class RGBPickerToolOptionsBox final : public ToolOptionsBox { Q_OBJECT ToolOptionCheckbox *m_realTimePickMode; // label with background color @@ -594,7 +607,7 @@ protected slots: // //============================================================================= -class StylePickerToolOptionsBox : public ToolOptionsBox { +class StylePickerToolOptionsBox final : public ToolOptionsBox { Q_OBJECT ToolOptionCheckbox *m_realTimePickMode; @@ -611,7 +624,7 @@ protected slots: //----------------------------------------------------------------------------- -class DVAPI ToolOptions : public QFrame { +class DVAPI ToolOptions final : public QFrame { Q_OBJECT int m_width, m_height; diff --git a/toonz/sources/include/tools/toolutils.h b/toonz/sources/include/tools/toolutils.h index a86aa0a..d196f86 100644 --- a/toonz/sources/include/tools/toolutils.h +++ b/toonz/sources/include/tools/toolutils.h @@ -249,7 +249,7 @@ public: //----------------------------------------------------------------------------- -class UndoModifyStrokeAndPaint : public UndoModifyStroke { +class UndoModifyStrokeAndPaint final : public UndoModifyStroke { std::vector *m_fillInformation; TRectD m_oldBBox; @@ -268,7 +268,7 @@ public: //----------------------------------------------------------------------------- -class UndoModifyListStroke : public TToolUndo { +class UndoModifyListStroke final : public TToolUndo { std::list m_strokeList; std::list::iterator m_beginIt, m_endIt; @@ -291,7 +291,7 @@ public: //----------------------------------------------------------------------------- -class UndoPencil : public TToolUndo { +class UndoPencil final : public TToolUndo { int m_strokeId; TStroke *m_stroke; std::vector *m_fillInformation; @@ -362,7 +362,7 @@ public: // // undo class (path strokes). call it BEFORE and register it AFTER path change // -class UndoPath : public TUndo { +class UndoPath final : public TUndo { TStageObjectSpline *m_spline; std::vector m_before, m_after; bool m_selfLoopBefore; @@ -384,7 +384,7 @@ public: // // UndoControlPointEditor // -class UndoControlPointEditor : public TToolUndo { +class UndoControlPointEditor final : public TToolUndo { std::pair m_oldStroke; std::pair m_newStroke; bool m_isStrokeDelete; @@ -436,7 +436,7 @@ protected: // ChooseColumnMenu // -class ColumChooserMenu : public DragMenu { +class ColumChooserMenu final : public DragMenu { public: ColumChooserMenu(TXsheet *xsh, const std::vector &columnIndexes); int execute(); diff --git a/toonz/sources/include/toonz/cleanupcolorstyles.h b/toonz/sources/include/toonz/cleanupcolorstyles.h index 5e2440f..f57ec04 100644 --- a/toonz/sources/include/toonz/cleanupcolorstyles.h +++ b/toonz/sources/include/toonz/cleanupcolorstyles.h @@ -67,7 +67,7 @@ private: //------------------------------------------------------------------- -class DVAPI TColorCleanupStyle : public TCleanupStyle { +class DVAPI TColorCleanupStyle final : public TCleanupStyle { double m_hRange; double m_lineWidth; @@ -101,7 +101,7 @@ private: //------------------------------------------------------------------- -class DVAPI TBlackCleanupStyle : public TCleanupStyle { +class DVAPI TBlackCleanupStyle final : public TCleanupStyle { double m_colorThreshold, m_whiteThreshold; public: diff --git a/toonz/sources/include/toonz/fullcolorpalette.h b/toonz/sources/include/toonz/fullcolorpalette.h index c476acc..e1308f2 100644 --- a/toonz/sources/include/toonz/fullcolorpalette.h +++ b/toonz/sources/include/toonz/fullcolorpalette.h @@ -21,7 +21,7 @@ class TPalette; class ToonzScene; -class DVAPI FullColorPalette : public QObject { +class DVAPI FullColorPalette final : public QObject { Q_OBJECT TPalette *m_palette; diff --git a/toonz/sources/include/toonz/imagestyles.h b/toonz/sources/include/toonz/imagestyles.h index 45871c0..a2c0b1e 100644 --- a/toonz/sources/include/toonz/imagestyles.h +++ b/toonz/sources/include/toonz/imagestyles.h @@ -81,7 +81,9 @@ public: //-------------------------------------------------------------------------------------------------------- -class DVAPI TTextureStyle : public TOutlineStyle, TRasterStyleFx, TImageStyle { +class DVAPI TTextureStyle final : public TOutlineStyle, + TRasterStyleFx, + TImageStyle { public: private: TTextureParams m_params; diff --git a/toonz/sources/include/toonz/movierenderer.h b/toonz/sources/include/toonz/movierenderer.h index c595963..e2f7400 100644 --- a/toonz/sources/include/toonz/movierenderer.h +++ b/toonz/sources/include/toonz/movierenderer.h @@ -39,7 +39,7 @@ In a more generic view, the term 'movie' represents here a generic sequence of images, which may even be kept in memory rather than written to file. */ -class DVAPI MovieRenderer : public QObject { +class DVAPI MovieRenderer final : public QObject { Q_OBJECT class Imp; diff --git a/toonz/sources/include/toonz/multimediarenderer.h b/toonz/sources/include/toonz/multimediarenderer.h index 1692e62..fd3d7a7 100644 --- a/toonz/sources/include/toonz/multimediarenderer.h +++ b/toonz/sources/include/toonz/multimediarenderer.h @@ -46,7 +46,7 @@ class ToonzScene; class ToonzScene; -class DVAPI MultimediaRenderer : public QObject { +class DVAPI MultimediaRenderer final : public QObject { Q_OBJECT class Imp; diff --git a/toonz/sources/include/toonz/namebuilder.h b/toonz/sources/include/toonz/namebuilder.h index 0f04081..8e47749 100644 --- a/toonz/sources/include/toonz/namebuilder.h +++ b/toonz/sources/include/toonz/namebuilder.h @@ -33,7 +33,7 @@ public: //------------------------------------------------------------------- // NameCreator genera la sequenza 'A', 'B', ... -class DVAPI NameCreator : public NameBuilder { +class DVAPI NameCreator final : public NameBuilder { std::vector m_s; public: @@ -43,7 +43,7 @@ public: //------------------------------------------------------------------- -class DVAPI NameModifier : public NameBuilder { +class DVAPI NameModifier final : public NameBuilder { std::wstring m_nameBase; int m_index; diff --git a/toonz/sources/include/toonz/observer.h b/toonz/sources/include/toonz/observer.h index 1e0a9b4..3c98ce7 100644 --- a/toonz/sources/include/toonz/observer.h +++ b/toonz/sources/include/toonz/observer.h @@ -64,7 +64,7 @@ public: //------------------------------------------------------------------- template -class TObserverListT : public TObserverList { +class TObserverListT final : public TObserverList { friend class TNotifier; public: diff --git a/toonz/sources/include/toonz/palettecontroller.h b/toonz/sources/include/toonz/palettecontroller.h index 60007dc..1296b38 100644 --- a/toonz/sources/include/toonz/palettecontroller.h +++ b/toonz/sources/include/toonz/palettecontroller.h @@ -32,7 +32,7 @@ class TPaletteHandle; // PaletteController declaration //************************************************************************ -class DVAPI PaletteController : public QObject { +class DVAPI PaletteController final : public QObject { Q_OBJECT TPaletteHandle *m_currentLevelPalette; //!< (\p owned) Handle to the palette diff --git a/toonz/sources/include/toonz/plasticdeformerfx.h b/toonz/sources/include/toonz/plasticdeformerfx.h index 9673257..8f2e82c 100644 --- a/toonz/sources/include/toonz/plasticdeformerfx.h +++ b/toonz/sources/include/toonz/plasticdeformerfx.h @@ -25,7 +25,7 @@ class TXsheet; //! PlasticDeformerFx is a hidden fx used to inject data about a plastic //! deformation just above a //! TLevelColumnFx instance. -class PlasticDeformerFx : public TRasterFx { +class PlasticDeformerFx final : public TRasterFx { FX_DECLARATION(PlasticDeformerFx) public: diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.h index 26c969e..1badd26 100644 --- a/toonz/sources/include/toonz/preferences.h +++ b/toonz/sources/include/toonz/preferences.h @@ -46,7 +46,7 @@ class QSettings; \brief Stores application-wide preferences used throughout Toonz. */ -class DVAPI Preferences : public QObject // singleton +class DVAPI Preferences final : public QObject // singleton { Q_OBJECT diff --git a/toonz/sources/include/toonz/sceneresources.h b/toonz/sources/include/toonz/sceneresources.h index 85e9595..91f98db 100644 --- a/toonz/sources/include/toonz/sceneresources.h +++ b/toonz/sources/include/toonz/sceneresources.h @@ -130,7 +130,7 @@ updatePath() */ //============================================================================= -class DVAPI ScenePalette : public SceneResource { +class DVAPI ScenePalette final : public SceneResource { TXshPaletteLevel *m_pl; TFilePath m_oldPath, m_oldActualPath; @@ -174,7 +174,7 @@ updatePath() */ //============================================================================= -class DVAPI SceneLevel : public SceneResource { +class DVAPI SceneLevel final : public SceneResource { TXshSimpleLevel *m_sl; TFilePath m_oldPath, m_oldActualPath; TFilePath m_oldScannedPath, m_oldActualScannedPath; @@ -218,7 +218,7 @@ path */ //============================================================================= -class DVAPI SceneSound : public SceneResource { +class DVAPI SceneSound final : public SceneResource { TXshSoundLevel *m_sl; TFilePath m_oldPath, m_oldActualPath; @@ -326,7 +326,7 @@ private: //============================================================================= -class DVAPI ResourceImporter : public ResourceProcessor { +class DVAPI ResourceImporter final : public ResourceProcessor { public: ResourceImporter(ToonzScene *scene, TProject *dstProject, ResourceImportStrategy &strategy); @@ -363,7 +363,7 @@ private: // Rende tutte le risorse locali: tutte quelle con path assoluto // vengono copiate dentro il progetto -class DVAPI ResourceCollector : public ResourceProcessor { +class DVAPI ResourceCollector final : public ResourceProcessor { ToonzScene *m_scene; int m_count; std::map m_collectedFiles; diff --git a/toonz/sources/include/toonz/scriptbinding.h b/toonz/sources/include/toonz/scriptbinding.h index d4daffc..2168539 100644 --- a/toonz/sources/include/toonz/scriptbinding.h +++ b/toonz/sources/include/toonz/scriptbinding.h @@ -48,7 +48,7 @@ class TFilePath; namespace TScriptBinding { -class DVAPI Void : public QObject { +class DVAPI Void final : public QObject { Q_OBJECT public: WRAPPER_STD_METHODS(Void) diff --git a/toonz/sources/include/toonz/scriptbinding_centerline_vectorizer.h b/toonz/sources/include/toonz/scriptbinding_centerline_vectorizer.h index 257ecda..638cc42 100644 --- a/toonz/sources/include/toonz/scriptbinding_centerline_vectorizer.h +++ b/toonz/sources/include/toonz/scriptbinding_centerline_vectorizer.h @@ -10,7 +10,7 @@ class TXshSimpleLevel; namespace TScriptBinding { -class DVAPI CenterlineVectorizer : public Wrapper { +class DVAPI CenterlineVectorizer final : public Wrapper { Q_OBJECT CenterlineConfiguration *m_parameters; diff --git a/toonz/sources/include/toonz/scriptbinding_files.h b/toonz/sources/include/toonz/scriptbinding_files.h index f0b0f58..d220d57 100644 --- a/toonz/sources/include/toonz/scriptbinding_files.h +++ b/toonz/sources/include/toonz/scriptbinding_files.h @@ -10,7 +10,7 @@ namespace TScriptBinding { -class DVAPI FilePath : public Wrapper { +class DVAPI FilePath final : public Wrapper { Q_OBJECT QString m_filePath; diff --git a/toonz/sources/include/toonz/scriptbinding_image.h b/toonz/sources/include/toonz/scriptbinding_image.h index 6f4843e..07925e8 100644 --- a/toonz/sources/include/toonz/scriptbinding_image.h +++ b/toonz/sources/include/toonz/scriptbinding_image.h @@ -7,7 +7,7 @@ namespace TScriptBinding { -class DVAPI Image : public Wrapper { +class DVAPI Image final : public Wrapper { Q_OBJECT TImageP m_img; diff --git a/toonz/sources/include/toonz/scriptbinding_image_builder.h b/toonz/sources/include/toonz/scriptbinding_image_builder.h index cf2d8c2..bfe4ed5 100644 --- a/toonz/sources/include/toonz/scriptbinding_image_builder.h +++ b/toonz/sources/include/toonz/scriptbinding_image_builder.h @@ -10,7 +10,7 @@ class TXshSimpleLevel; namespace TScriptBinding { -class DVAPI Transform : public Wrapper { +class DVAPI Transform final : public Wrapper { Q_OBJECT TAffine m_affine; @@ -31,7 +31,7 @@ public: const TAffine &getAffine() const { return m_affine; } }; -class DVAPI ImageBuilder : public Wrapper { +class DVAPI ImageBuilder final : public Wrapper { Q_OBJECT TImageP m_img; int m_width, m_height; diff --git a/toonz/sources/include/toonz/scriptbinding_level.h b/toonz/sources/include/toonz/scriptbinding_level.h index 4a41a99..777b9c3 100644 --- a/toonz/sources/include/toonz/scriptbinding_level.h +++ b/toonz/sources/include/toonz/scriptbinding_level.h @@ -11,7 +11,7 @@ class TXshSimpleLevel; namespace TScriptBinding { -class DVAPI Level : public Wrapper { +class DVAPI Level final : public Wrapper { Q_OBJECT TXshSimpleLevel *m_sl; ToonzScene *m_scene; diff --git a/toonz/sources/include/toonz/scriptbinding_outline_vectorizer.h b/toonz/sources/include/toonz/scriptbinding_outline_vectorizer.h index a1000e9..db95a5d 100644 --- a/toonz/sources/include/toonz/scriptbinding_outline_vectorizer.h +++ b/toonz/sources/include/toonz/scriptbinding_outline_vectorizer.h @@ -10,7 +10,7 @@ class TXshSimpleLevel; namespace TScriptBinding { -class DVAPI OutlineVectorizer : public Wrapper { +class DVAPI OutlineVectorizer final : public Wrapper { Q_OBJECT NewOutlineConfiguration *m_parameters; diff --git a/toonz/sources/include/toonz/scriptbinding_rasterizer.h b/toonz/sources/include/toonz/scriptbinding_rasterizer.h index 7464127..23d5912 100644 --- a/toonz/sources/include/toonz/scriptbinding_rasterizer.h +++ b/toonz/sources/include/toonz/scriptbinding_rasterizer.h @@ -10,7 +10,7 @@ class TXshSimpleLevel; namespace TScriptBinding { -class DVAPI Rasterizer : public Wrapper { +class DVAPI Rasterizer final : public Wrapper { Q_OBJECT bool m_colorMapped; int m_xres, m_yres; diff --git a/toonz/sources/include/toonz/scriptbinding_renderer.h b/toonz/sources/include/toonz/scriptbinding_renderer.h index 6d45b58..971b524 100644 --- a/toonz/sources/include/toonz/scriptbinding_renderer.h +++ b/toonz/sources/include/toonz/scriptbinding_renderer.h @@ -7,7 +7,7 @@ namespace TScriptBinding { -class DVAPI Renderer : public Wrapper { +class DVAPI Renderer final : public Wrapper { Q_OBJECT class Imp; Imp *m_imp; diff --git a/toonz/sources/include/toonz/scriptbinding_scene.h b/toonz/sources/include/toonz/scriptbinding_scene.h index 3427f1a..9198651 100644 --- a/toonz/sources/include/toonz/scriptbinding_scene.h +++ b/toonz/sources/include/toonz/scriptbinding_scene.h @@ -7,7 +7,7 @@ namespace TScriptBinding { -class DVAPI Scene : public Wrapper { +class DVAPI Scene final : public Wrapper { Q_OBJECT ToonzScene *m_scene; diff --git a/toonz/sources/include/toonz/scriptbinding_toonz_raster_converter.h b/toonz/sources/include/toonz/scriptbinding_toonz_raster_converter.h index 0600d5a..07e8399 100644 --- a/toonz/sources/include/toonz/scriptbinding_toonz_raster_converter.h +++ b/toonz/sources/include/toonz/scriptbinding_toonz_raster_converter.h @@ -10,7 +10,7 @@ class TXshSimpleLevel; namespace TScriptBinding { -class DVAPI ToonzRasterConverter : public Wrapper { +class DVAPI ToonzRasterConverter final : public Wrapper { Q_OBJECT bool m_flatSource; diff --git a/toonz/sources/include/toonz/scriptengine.h b/toonz/sources/include/toonz/scriptengine.h index dc55208..3b667b1 100644 --- a/toonz/sources/include/toonz/scriptengine.h +++ b/toonz/sources/include/toonz/scriptengine.h @@ -31,7 +31,7 @@ public: virtual void execute() = 0; }; -class DVAPI ScriptEngine : public QObject { +class DVAPI ScriptEngine final : public QObject { Q_OBJECT QScriptEngine *m_engine; class Executor; diff --git a/toonz/sources/include/toonz/stageobjectutil.h b/toonz/sources/include/toonz/stageobjectutil.h index b7a1965..ba424aa 100644 --- a/toonz/sources/include/toonz/stageobjectutil.h +++ b/toonz/sources/include/toonz/stageobjectutil.h @@ -104,7 +104,7 @@ public: // //----------------------------------------------------------------------------- -class DVAPI UndoSetKeyFrame : public TUndo { +class DVAPI UndoSetKeyFrame final : public TUndo { TStageObjectId m_objId; int m_frame; @@ -146,7 +146,7 @@ public: // //----------------------------------------------------------------------------- -class DVAPI UndoRemoveKeyFrame : public TUndo { +class DVAPI UndoRemoveKeyFrame final : public TUndo { TStageObjectId m_objId; int m_frame; @@ -184,7 +184,7 @@ public: // UndoStageObjectCenterMove //----------------------------------------------------------------------------- -class DVAPI UndoStageObjectCenterMove : public TUndo { +class DVAPI UndoStageObjectCenterMove final : public TUndo { TStageObjectId m_pid; int m_frame; TPointD m_before, m_after; @@ -220,7 +220,7 @@ public: // UndoStageObjectMove //----------------------------------------------------------------------------- -class DVAPI UndoStageObjectMove : public TUndo { +class DVAPI UndoStageObjectMove final : public TUndo { TStageObjectValues m_before, m_after; TObjectHandle *m_objectHandle; // OK: viene usato per notificare i cambiamenti! @@ -245,7 +245,7 @@ public: // UndoStageObjectPinned //----------------------------------------------------------------------------- -class DVAPI UndoStageObjectPinned : public TUndo { +class DVAPI UndoStageObjectPinned final : public TUndo { TStageObjectId m_pid; int m_frame; bool m_before, m_after; diff --git a/toonz/sources/include/toonz/stagevisitor.h b/toonz/sources/include/toonz/stagevisitor.h index b0efb4f..f9d8c4d 100644 --- a/toonz/sources/include/toonz/stagevisitor.h +++ b/toonz/sources/include/toonz/stagevisitor.h @@ -182,7 +182,7 @@ DVAPI void visit(Visitor &visitor, TXshLevel *level, const TFrameId &fid, \warning The RasterPainter visitor expects an active OpenGL context. */ -class DVAPI RasterPainter : public Visitor { +class DVAPI RasterPainter final : public Visitor { private: //! Class used to deal with composition of raster images. A Node instance //! represents a @@ -277,7 +277,7 @@ public: //============================================================================= -class DVAPI Picker : public Visitor { +class DVAPI Picker final : public Visitor { std::vector m_columnIndexes, m_rows; TPointD m_point; TAffine m_viewAff; @@ -304,7 +304,7 @@ public: //! The derived Stage::Visitor responsible for camera-stand rendering in 3D mode -class DVAPI OpenGlPainter : public Visitor // Yep, the name sucks... +class DVAPI OpenGlPainter final : public Visitor // Yep, the name sucks... { TAffine m_viewAff; TRect m_clipRect; diff --git a/toonz/sources/include/toonz/stylemanager.h b/toonz/sources/include/toonz/stylemanager.h index 082a4ba..5c655d7 100644 --- a/toonz/sources/include/toonz/stylemanager.h +++ b/toonz/sources/include/toonz/stylemanager.h @@ -31,7 +31,7 @@ class QImage; // CustomStyleManager declaration //******************************************************************************** -class DVAPI CustomStyleManager : public QObject { +class DVAPI CustomStyleManager final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/include/toonz/tcenterlinevectorizer.h b/toonz/sources/include/toonz/tcenterlinevectorizer.h index 8e933e4..7b8c970 100644 --- a/toonz/sources/include/toonz/tcenterlinevectorizer.h +++ b/toonz/sources/include/toonz/tcenterlinevectorizer.h @@ -34,7 +34,7 @@ It can also deal notifications about its progress status, and is receptive to user cancels. \sa VectorizerPopup, Vectorizer, VectorizerConfiguration classes.*/ -class DVAPI VectorizerCore : public QObject { +class DVAPI VectorizerCore final : public QObject { Q_OBJECT int m_currPartial; diff --git a/toonz/sources/include/toonz/tcolumnfx.h b/toonz/sources/include/toonz/tcolumnfx.h index e45eef4..861bb80 100644 --- a/toonz/sources/include/toonz/tcolumnfx.h +++ b/toonz/sources/include/toonz/tcolumnfx.h @@ -175,7 +175,7 @@ private: // TZeraryColumnFx declaration //******************************************************************************************* -class DVAPI TZeraryColumnFx : public TColumnFx { +class DVAPI TZeraryColumnFx final : public TColumnFx { TXshZeraryFxColumn *m_zeraryFxColumn; TZeraryFx *m_fx; @@ -222,7 +222,7 @@ private: // TXsheetFx declaration //******************************************************************************************* -class TXsheetFx : public TRasterFx { +class TXsheetFx final : public TRasterFx { FxDag *m_fxDag; public: @@ -257,7 +257,7 @@ private: // TOutputFx declaration //******************************************************************************************* -class TOutputFx : public TRasterFx { +class TOutputFx final : public TRasterFx { TRasterFxPort m_input; public: diff --git a/toonz/sources/include/toonz/tcolumnhandle.h b/toonz/sources/include/toonz/tcolumnhandle.h index 233ebe0..277c1d5 100644 --- a/toonz/sources/include/toonz/tcolumnhandle.h +++ b/toonz/sources/include/toonz/tcolumnhandle.h @@ -23,7 +23,7 @@ class TXshColumn; // TColumnHandle //----------------------------------------------------------------------------- -class DVAPI TColumnHandle : public QObject { +class DVAPI TColumnHandle final : public QObject { Q_OBJECT TXshColumn *m_column; diff --git a/toonz/sources/include/toonz/tdistort.h b/toonz/sources/include/toonz/tdistort.h index 575557e..e878e5d 100644 --- a/toonz/sources/include/toonz/tdistort.h +++ b/toonz/sources/include/toonz/tdistort.h @@ -110,7 +110,7 @@ public: //! The BilinearDistorterBase is just a convenience class implementing a //! lightweight version of //! \b BilinearDistorter class when the source quad is a rect. -class DVAPI BilinearDistorterBase : public TQuadDistorter { +class DVAPI BilinearDistorterBase final : public TQuadDistorter { // Used to make things a little bit faster. TPointD m_A, m_B, m_C, m_D; double m_a, m_b0; @@ -133,7 +133,7 @@ public: //! of the source corners into the same combinations of destination ones. The //! resulting image deformation //! is similar to bending a paper foil. -class DVAPI BilinearDistorter : public TQuadDistorter { +class DVAPI BilinearDistorter final : public TQuadDistorter { struct Base { TPointD m_p00, m_p10, m_p01, m_p11; // Used to make things a little bit faster. @@ -169,7 +169,7 @@ public: //! The PerspectiveDistorter class implements a quadrilateral distorter that //! makes the source quad //! bend into the destination one while keeping a perspectical resemblance. -class DVAPI PerspectiveDistorter : public TQuadDistorter { +class DVAPI PerspectiveDistorter final : public TQuadDistorter { //================================================================================================ // TPerspect //================================================================================================ diff --git a/toonz/sources/include/toonz/tframehandle.h b/toonz/sources/include/toonz/tframehandle.h index 259bc73..6d5a656 100644 --- a/toonz/sources/include/toonz/tframehandle.h +++ b/toonz/sources/include/toonz/tframehandle.h @@ -27,7 +27,7 @@ class TXsheet; // TFrameHandle //----------------------------------------------------------------------------- -class DVAPI TFrameHandle : public QObject { +class DVAPI TFrameHandle final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/include/toonz/tfxhandle.h b/toonz/sources/include/toonz/tfxhandle.h index 7505f38..ca3ba98 100644 --- a/toonz/sources/include/toonz/tfxhandle.h +++ b/toonz/sources/include/toonz/tfxhandle.h @@ -24,7 +24,7 @@ class TFx; // TFxHandle //----------------------------------------------------------------------------- -class DVAPI TFxHandle : public QObject { +class DVAPI TFxHandle final : public QObject { Q_OBJECT private: diff --git a/toonz/sources/include/toonz/tobjecthandle.h b/toonz/sources/include/toonz/tobjecthandle.h index 9dc71d7..502731b 100644 --- a/toonz/sources/include/toonz/tobjecthandle.h +++ b/toonz/sources/include/toonz/tobjecthandle.h @@ -32,7 +32,7 @@ class TStageObjectSpline; Puo' anche essere la spline associata all'oggetto */ -class DVAPI TObjectHandle : public QObject { +class DVAPI TObjectHandle final : public QObject { Q_OBJECT TStageObjectId m_objectId; diff --git a/toonz/sources/include/toonz/tonionskinmaskhandle.h b/toonz/sources/include/toonz/tonionskinmaskhandle.h index 26ee32b..a2c40c9 100644 --- a/toonz/sources/include/toonz/tonionskinmaskhandle.h +++ b/toonz/sources/include/toonz/tonionskinmaskhandle.h @@ -25,7 +25,7 @@ class OnionSkinMask; // TOnionSkinMaskHandle //----------------------------------------------------------------------------- -class DVAPI TOnionSkinMaskHandle : public QObject { +class DVAPI TOnionSkinMaskHandle final : public QObject { Q_OBJECT OnionSkinMask m_onionSkinMask; diff --git a/toonz/sources/include/toonz/tpalettehandle.h b/toonz/sources/include/toonz/tpalettehandle.h index 75b37ca..2f0a27e 100644 --- a/toonz/sources/include/toonz/tpalettehandle.h +++ b/toonz/sources/include/toonz/tpalettehandle.h @@ -24,7 +24,7 @@ // TPaletteHandle //----------------------------------------------------------------------------- -class DVAPI TPaletteHandle : public QObject { +class DVAPI TPaletteHandle final : public QObject { Q_OBJECT TPalette *m_palette; diff --git a/toonz/sources/include/toonz/tproject.h b/toonz/sources/include/toonz/tproject.h index b9da773..399f5f6 100644 --- a/toonz/sources/include/toonz/tproject.h +++ b/toonz/sources/include/toonz/tproject.h @@ -20,7 +20,7 @@ class TSceneProperties; #define DVVAR DV_IMPORT_VAR #endif -class DVAPI TProject : public TSmartObject { +class DVAPI TProject final : public TSmartObject { TFilePath m_name, m_path; std::vector m_folderNames; std::map m_folders; diff --git a/toonz/sources/include/toonz/tscenehandle.h b/toonz/sources/include/toonz/tscenehandle.h index 203ee04..fab6259 100644 --- a/toonz/sources/include/toonz/tscenehandle.h +++ b/toonz/sources/include/toonz/tscenehandle.h @@ -25,7 +25,7 @@ class TFilePath; // TSceneHandle //----------------------------------------------------------------------------- -class DVAPI TSceneHandle : public QObject { +class DVAPI TSceneHandle final : public QObject { Q_OBJECT ToonzScene *m_scene; diff --git a/toonz/sources/include/toonz/tstageobject.h b/toonz/sources/include/toonz/tstageobject.h index c3ae0f6..8862177 100644 --- a/toonz/sources/include/toonz/tstageobject.h +++ b/toonz/sources/include/toonz/tstageobject.h @@ -92,7 +92,7 @@ responsibility of the TStageObjectTree class. */ -class DVAPI TStageObject : public TSmartObject, public TParamObserver { +class DVAPI TStageObject final : public TSmartObject, public TParamObserver { DECLARE_CLASS_CODE public: diff --git a/toonz/sources/include/toonz/tstageobjectspline.h b/toonz/sources/include/toonz/tstageobjectspline.h index 2f995b1..bc9ca3f 100644 --- a/toonz/sources/include/toonz/tstageobjectspline.h +++ b/toonz/sources/include/toonz/tstageobjectspline.h @@ -33,7 +33,7 @@ class TDoubleParam; */ //============================================================================= -class DVAPI TStageObjectSpline : public TSmartObject, public TPersist { +class DVAPI TStageObjectSpline final : public TSmartObject, public TPersist { PERSIST_DECLARATION(TStageObjectSpline) TStroke *m_stroke; DECLARE_CLASS_CODE diff --git a/toonz/sources/include/toonz/tstageobjecttree.h b/toonz/sources/include/toonz/tstageobjecttree.h index 765da6d..03d6f00 100644 --- a/toonz/sources/include/toonz/tstageobjecttree.h +++ b/toonz/sources/include/toonz/tstageobjecttree.h @@ -82,7 +82,7 @@ public: */ //============================================================================= -class DVAPI TStageObjectTree : public TPersist { +class DVAPI TStageObjectTree final : public TPersist { PERSIST_DECLARATION(TStageObjectTree) struct TStageObjectTreeImp; std::unique_ptr m_imp; diff --git a/toonz/sources/include/toonz/ttileset.h b/toonz/sources/include/toonz/ttileset.h index cd41387..450c5d9 100644 --- a/toonz/sources/include/toonz/ttileset.h +++ b/toonz/sources/include/toonz/ttileset.h @@ -73,12 +73,12 @@ public: //******************************************************************************** -class DVAPI TTileSetCM32 : public TTileSet { +class DVAPI TTileSetCM32 final : public TTileSet { public: // per adesso, facciamo che comprime sempre, // appena costruisce l'oggetto. Poi potremmo dare la scelta, // anche per decidere se farlo subito o meno. - class DVAPI Tile : public TTileSet::Tile { + class DVAPI Tile final : public TTileSet::Tile { public: Tile(); Tile(const TRasterCM32P &ras, const TPoint &p); @@ -113,12 +113,12 @@ public: //******************************************************************************** -class DVAPI TTileSetFullColor : public TTileSet { +class DVAPI TTileSetFullColor final : public TTileSet { public: // per adesso, facciamo che comprime sempre, // appena costruisce l'oggetto. Poi potremmo dare la scelta, // anche per decidere se farlo subito o meno. - class DVAPI Tile : public TTileSet::Tile { + class DVAPI Tile final : public TTileSet::Tile { public: Tile(); Tile(const TRasterP &ras, const TPoint &p); diff --git a/toonz/sources/include/toonz/txshchildlevel.h b/toonz/sources/include/toonz/txshchildlevel.h index f88b92b..696d990 100644 --- a/toonz/sources/include/toonz/txshchildlevel.h +++ b/toonz/sources/include/toonz/txshchildlevel.h @@ -36,7 +36,7 @@ level */ //============================================================================= -class DVAPI TXshChildLevel : public TXshLevel { +class DVAPI TXshChildLevel final : public TXshLevel { PERSIST_DECLARATION(TXshChildLevel) TXsheet *m_xsheet; diff --git a/toonz/sources/include/toonz/txsheet.h b/toonz/sources/include/toonz/txsheet.h index f0ef22f..f75b926 100644 --- a/toonz/sources/include/toonz/txsheet.h +++ b/toonz/sources/include/toonz/txsheet.h @@ -116,7 +116,7 @@ the xsheet refers using getScene() and setScene(). */ -class DVAPI TXsheet : public TSmartObject, public TPersist { +class DVAPI TXsheet final : public TSmartObject, public TPersist { PERSIST_DECLARATION(TXsheet) public: diff --git a/toonz/sources/include/toonz/txsheethandle.h b/toonz/sources/include/toonz/txsheethandle.h index 147d9b6..12e5723 100644 --- a/toonz/sources/include/toonz/txsheethandle.h +++ b/toonz/sources/include/toonz/txsheethandle.h @@ -24,7 +24,7 @@ class TXsheet; // TXsheetHandle //----------------------------------------------------------------------------- -class DVAPI TXsheetHandle : public QObject { +class DVAPI TXsheetHandle final : public QObject { Q_OBJECT TXsheet *m_xsheet; diff --git a/toonz/sources/include/toonz/txshlevelcolumn.h b/toonz/sources/include/toonz/txshlevelcolumn.h index 741c651..a351505 100644 --- a/toonz/sources/include/toonz/txshlevelcolumn.h +++ b/toonz/sources/include/toonz/txshlevelcolumn.h @@ -34,7 +34,7 @@ getIcon() */ //============================================================================= -class DVAPI TXshLevelColumn : public TXshCellColumn { +class DVAPI TXshLevelColumn final : public TXshCellColumn { PERSIST_DECLARATION(TXshLevelColumn) TLevelColumnFx *m_fx; std::string m_iconId; diff --git a/toonz/sources/include/toonz/txshlevelhandle.h b/toonz/sources/include/toonz/txshlevelhandle.h index 6beaf7f..3751c71 100644 --- a/toonz/sources/include/toonz/txshlevelhandle.h +++ b/toonz/sources/include/toonz/txshlevelhandle.h @@ -21,7 +21,7 @@ class TXshSimpleLevel; // TXshLevelHandle //----------------------------------------------------------------------------- -class DVAPI TXshLevelHandle : public QObject { +class DVAPI TXshLevelHandle final : public QObject { Q_OBJECT TXshLevel *m_level; diff --git a/toonz/sources/include/toonz/txshmeshcolumn.h b/toonz/sources/include/toonz/txshmeshcolumn.h index 7560d83..6a76e52 100644 --- a/toonz/sources/include/toonz/txshmeshcolumn.h +++ b/toonz/sources/include/toonz/txshmeshcolumn.h @@ -19,7 +19,7 @@ // TXshMeshColumn declaration //******************************************************************************* -class DVAPI TXshMeshColumn : public TXshCellColumn { +class DVAPI TXshMeshColumn final : public TXshCellColumn { PERSIST_DECLARATION(TXshMeshColumn) public: diff --git a/toonz/sources/include/toonz/txshpalettecolumn.h b/toonz/sources/include/toonz/txshpalettecolumn.h index 0925e7a..f2675be 100644 --- a/toonz/sources/include/toonz/txshpalettecolumn.h +++ b/toonz/sources/include/toonz/txshpalettecolumn.h @@ -27,7 +27,7 @@ class TPaletteColumnFx; */ //============================================================================= -class DVAPI TXshPaletteColumn : public TXshCellColumn { +class DVAPI TXshPaletteColumn final : public TXshCellColumn { PERSIST_DECLARATION(TXshPaletteColumn) TPaletteColumnFx *m_fx; diff --git a/toonz/sources/include/toonz/txshpalettelevel.h b/toonz/sources/include/toonz/txshpalettelevel.h index 74321af..eaae2be 100644 --- a/toonz/sources/include/toonz/txshpalettelevel.h +++ b/toonz/sources/include/toonz/txshpalettelevel.h @@ -30,7 +30,7 @@ class TContentHistory; */ //============================================================================= -class DVAPI TXshPaletteLevel : public TXshLevel { +class DVAPI TXshPaletteLevel final : public TXshLevel { private: PERSIST_DECLARATION(TXshPaletteLevel) diff --git a/toonz/sources/include/toonz/txshsimplelevel.h b/toonz/sources/include/toonz/txshsimplelevel.h index 5ab9909..2ffba7e 100644 --- a/toonz/sources/include/toonz/txshsimplelevel.h +++ b/toonz/sources/include/toonz/txshsimplelevel.h @@ -57,7 +57,7 @@ class TContentHistory; a boost flat_set. */ -class DVAPI TXshSimpleLevel : public TXshLevel { +class DVAPI TXshSimpleLevel final : public TXshLevel { Q_OBJECT PERSIST_DECLARATION(TXshSimpleLevel) diff --git a/toonz/sources/include/toonz/txshsoundcolumn.h b/toonz/sources/include/toonz/txshsoundcolumn.h index 2ea4182..23c4eb6 100644 --- a/toonz/sources/include/toonz/txshsoundcolumn.h +++ b/toonz/sources/include/toonz/txshsoundcolumn.h @@ -31,7 +31,7 @@ class ColumnLevel; /*!Inherits \b TXshCellColumn. */ //============================================================================= -class DVAPI TXshSoundColumn : public QObject, public TXshCellColumn { +class DVAPI TXshSoundColumn final : public QObject, public TXshCellColumn { Q_OBJECT PERSIST_DECLARATION(TXshSoundColumn) diff --git a/toonz/sources/include/toonz/txshsoundlevel.h b/toonz/sources/include/toonz/txshsoundlevel.h index 7380374..3d693e3 100644 --- a/toonz/sources/include/toonz/txshsoundlevel.h +++ b/toonz/sources/include/toonz/txshsoundlevel.h @@ -20,7 +20,7 @@ #define DVVAR DV_IMPORT_VAR #endif -class DVAPI TXshSoundLevel : public TXshLevel { +class DVAPI TXshSoundLevel final : public TXshLevel { PERSIST_DECLARATION(TXshSoundLevel) TSoundTrackP m_soundTrack; diff --git a/toonz/sources/include/toonz/txshsoundtextcolumn.h b/toonz/sources/include/toonz/txshsoundtextcolumn.h index 9ecd63c..0e840b8 100644 --- a/toonz/sources/include/toonz/txshsoundtextcolumn.h +++ b/toonz/sources/include/toonz/txshsoundtextcolumn.h @@ -24,7 +24,7 @@ /*!Inherits \b TXshCellColumn. */ //============================================================================= -class DVAPI TXshSoundTextColumn : public TXshCellColumn { +class DVAPI TXshSoundTextColumn final : public TXshCellColumn { PERSIST_DECLARATION(TXshSoundTextColumn) public: diff --git a/toonz/sources/include/toonz/txshsoundtextlevel.h b/toonz/sources/include/toonz/txshsoundtextlevel.h index 2e93f41..85f0e1f 100644 --- a/toonz/sources/include/toonz/txshsoundtextlevel.h +++ b/toonz/sources/include/toonz/txshsoundtextlevel.h @@ -23,7 +23,7 @@ //! The TXshSoundTextLevel //============================================================================= -class DVAPI TXshSoundTextLevel : public TXshLevel { +class DVAPI TXshSoundTextLevel final : public TXshLevel { PERSIST_DECLARATION(TXshSoundTextLevel) DECLARE_CLASS_CODE diff --git a/toonz/sources/include/toonz/txshzeraryfxcolumn.h b/toonz/sources/include/toonz/txshzeraryfxcolumn.h index 03f5a1c..07730a3 100644 --- a/toonz/sources/include/toonz/txshzeraryfxcolumn.h +++ b/toonz/sources/include/toonz/txshzeraryfxcolumn.h @@ -32,7 +32,7 @@ to */ //============================================================================= -class DVAPI TXshZeraryFxColumn : public TXshCellColumn { +class DVAPI TXshZeraryFxColumn final : public TXshCellColumn { PERSIST_DECLARATION(TXshZeraryFxColumn) TZeraryColumnFx *m_zeraryColumnFx; TXshZeraryFxLevel *m_zeraryFxLevel; diff --git a/toonz/sources/include/toonz/txshzeraryfxlevel.h b/toonz/sources/include/toonz/txshzeraryfxlevel.h index 9ebb8be..9677fc8 100644 --- a/toonz/sources/include/toonz/txshzeraryfxlevel.h +++ b/toonz/sources/include/toonz/txshzeraryfxlevel.h @@ -27,7 +27,7 @@ class TXshZeraryFxColumn; */ //============================================================================= -class DVAPI TXshZeraryFxLevel : public TXshLevel { +class DVAPI TXshZeraryFxLevel final : public TXshLevel { PERSIST_DECLARATION(TXshZeraryFxLevel) TXshZeraryFxColumn *m_zeraryFxColumn; diff --git a/toonz/sources/include/toonz/vectorizerparameters.h b/toonz/sources/include/toonz/vectorizerparameters.h index 6b1dadc..eae3a3a 100644 --- a/toonz/sources/include/toonz/vectorizerparameters.h +++ b/toonz/sources/include/toonz/vectorizerparameters.h @@ -79,7 +79,7 @@ public: specialization for the centerline vectorization method. */ -class DVAPI CenterlineConfiguration : public VectorizerConfiguration { +class DVAPI CenterlineConfiguration final : public VectorizerConfiguration { public: /*!After threshold is done, raster zones of uniform ink or paint color whose area is under this parameter @@ -142,7 +142,7 @@ with activated region computing and painting.*/ specialization for the (new) outline vectorization method. */ -class DVAPI NewOutlineConfiguration : public VectorizerConfiguration { +class DVAPI NewOutlineConfiguration final : public VectorizerConfiguration { public: double m_adherenceTol; //!< Adherence to contour corners double m_angleTol; //!< Angle-based corners tolerance @@ -182,7 +182,7 @@ public: with a different outline vectorization algorithm. */ -class DVAPI OutlineConfiguration : public VectorizerConfiguration { +class DVAPI OutlineConfiguration final : public VectorizerConfiguration { public: int m_smoothness; // Outline @@ -215,7 +215,7 @@ public: \brief Container class for scene-bound vectorizer options. */ -class DVAPI VectorizerParameters : public TPersist { +class DVAPI VectorizerParameters final : public TPersist { PERSIST_DECLARATION(VectorizerParameters) public: diff --git a/toonz/sources/include/toonz4.6/raster.h b/toonz/sources/include/toonz4.6/raster.h index 0078776..65905c2 100644 --- a/toonz/sources/include/toonz4.6/raster.h +++ b/toonz/sources/include/toonz4.6/raster.h @@ -31,9 +31,7 @@ typedef enum { } RAS_TYPE; #ifdef VECCHIO -' typedef enum { RAS_NONE, RAS_BW, /* 1 bit, B=0, W=1, first pixel in bit 7 */ RAS_WB, /* " , W=0, B=1, " */ - RAS_GR8, /* grey tones, 8 bits */ - RAS_CM8, /* color-mapped, 8 bits */ +' typedef enum { RAS_NONE, RAS_BW, /* 1 bit, B=0, W=1, first pixel in bit 7 */ RAS_WB, /* " , W=0, B=1, " */ RAS_GR8, /* grey tones, 8 bits */ RAS_CM8, /* color-mapped, 8 bits */ RAS_GR16, /* grey tones, 16 bits */ RAS_RGB16, /* RGB 5+6+5 bits, red most significant */ RAS_RLEBW, /* 1 bit compressed(quick casm format) */ diff --git a/toonz/sources/include/toonzqt/addfxcontextmenu.h b/toonz/sources/include/toonzqt/addfxcontextmenu.h index 2531775..0d099d9 100644 --- a/toonz/sources/include/toonzqt/addfxcontextmenu.h +++ b/toonz/sources/include/toonzqt/addfxcontextmenu.h @@ -24,7 +24,7 @@ class PluginInformation; //! FxSchematicScene and its items! //! This method is used to create and keep updated the three menus. //! Each menus contains all toonz special effect and effect presets. -class AddFxContextMenu : public QObject { +class AddFxContextMenu final : public QObject { Q_OBJECT QMenu *m_insertMenu, *m_addMenu, *m_replaceMenu; diff --git a/toonz/sources/include/toonzqt/camerasettingswidget.h b/toonz/sources/include/toonzqt/camerasettingswidget.h index 0a4f8ae..14f7f2d 100644 --- a/toonz/sources/include/toonzqt/camerasettingswidget.h +++ b/toonz/sources/include/toonzqt/camerasettingswidget.h @@ -43,7 +43,7 @@ class CheckBox; //--------------------------------------------------------------- -class SimpleExpValidator : public QValidator { +class SimpleExpValidator final : public QValidator { public: SimpleExpValidator(QObject *parent) : QValidator(parent){}; State validate(QString &input, int &pos) const override; @@ -51,7 +51,7 @@ public: //--------------------------------------------------------------- // for A/R input field -class SimpleExpField : public QLineEdit { +class SimpleExpField final : public QLineEdit { SimpleExpValidator *m_validator; QString m_previousValue; @@ -69,7 +69,7 @@ protected: //--------------------------------------------------------------- -class DVAPI CameraSettingsWidget : public QFrame { +class DVAPI CameraSettingsWidget final : public QFrame { Q_OBJECT bool m_forCleanup; diff --git a/toonz/sources/include/toonzqt/colorfield.h b/toonz/sources/include/toonzqt/colorfield.h index 0450003..8bde1a1 100644 --- a/toonz/sources/include/toonzqt/colorfield.h +++ b/toonz/sources/include/toonzqt/colorfield.h @@ -40,7 +40,7 @@ namespace DVGui { // StyleSample //----------------------------------------------------------------------------- -class DVAPI StyleSample : public QWidget { +class DVAPI StyleSample final : public QWidget { Q_OBJECT QImage m_samplePixmap; TRaster32P m_bgRas; @@ -86,7 +86,7 @@ signals: // ChannelField //----------------------------------------------------------------------------- -class DVAPI ChannelField : public QWidget { +class DVAPI ChannelField final : public QWidget { Q_OBJECT DVGui::IntLineEdit *m_channelEdit; @@ -116,7 +116,7 @@ protected slots: // ColorField //----------------------------------------------------------------------------- -class DVAPI ColorField : public QWidget { +class DVAPI ColorField final : public QWidget { Q_OBJECT StyleSample *m_colorSample; @@ -196,7 +196,7 @@ signals: // CleanupColorField //----------------------------------------------------------------------------- -class DVAPI CleanupColorField : public QWidget { +class DVAPI CleanupColorField final : public QWidget { Q_OBJECT TPaletteHandle *m_ph; diff --git a/toonz/sources/include/toonzqt/combohistogram.h b/toonz/sources/include/toonzqt/combohistogram.h index 8df0e97..ada157a 100644 --- a/toonz/sources/include/toonzqt/combohistogram.h +++ b/toonz/sources/include/toonzqt/combohistogram.h @@ -42,7 +42,7 @@ class QLabel; // 120405 //----------------------------------------------------------------------------- -class DVAPI ComboHistoRGBLabel : public QWidget { +class DVAPI ComboHistoRGBLabel final : public QWidget { QColor m_color; public: @@ -81,7 +81,7 @@ protected: //----------------------------------------------------------------------------- -class DVAPI RGBHistoGraph : public ChannelHistoGraph { +class DVAPI RGBHistoGraph final : public ChannelHistoGraph { Q_OBJECT QVector m_rgbValues[3]; @@ -99,7 +99,7 @@ protected: }; //----------------------------------------------------------------------------- -class DVAPI ChannelColorBar : public QWidget { +class DVAPI ChannelColorBar final : public QWidget { Q_OBJECT QColor m_color; @@ -113,7 +113,7 @@ protected: //----------------------------------------------------------------------------- -class DVAPI ChannelHisto : public QWidget { +class DVAPI ChannelHisto final : public QWidget { Q_OBJECT ChannelHistoGraph *m_histogramGraph; @@ -133,7 +133,7 @@ protected slots: //----------------------------------------------------------------------------- -class DVAPI ComboHistogram : public QWidget { +class DVAPI ComboHistogram final : public QWidget { Q_OBJECT TRasterP m_raster; diff --git a/toonz/sources/include/toonzqt/doublefield.h b/toonz/sources/include/toonzqt/doublefield.h index d6b98a0..227a1ba 100644 --- a/toonz/sources/include/toonzqt/doublefield.h +++ b/toonz/sources/include/toonzqt/doublefield.h @@ -163,7 +163,7 @@ signals: can set this value using setValue(), setRange() and setDecimals(). */ -class DVAPI DoubleLineEdit : public DoubleValueLineEdit { +class DVAPI DoubleLineEdit final : public DoubleValueLineEdit { Q_OBJECT QDoubleValidator *m_validator; @@ -255,7 +255,7 @@ protected slots: Inherits \b PrimaryDoubleField. */ -class DVAPI MeasuredDoubleField : public DoubleValueField { +class DVAPI MeasuredDoubleField final : public DoubleValueField { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/doublepairfield.h b/toonz/sources/include/toonzqt/doublepairfield.h index bf65212..404dbc2 100644 --- a/toonz/sources/include/toonzqt/doublepairfield.h +++ b/toonz/sources/include/toonzqt/doublepairfield.h @@ -234,7 +234,7 @@ public: \image html DoublePairField.jpg */ -class DVAPI MeasuredDoublePairField : public DoubleValuePairField { +class DVAPI MeasuredDoublePairField final : public DoubleValuePairField { public: MeasuredDoublePairField(QWidget *parent = 0, bool isMaxRangeLimited = true); ~MeasuredDoublePairField() {} diff --git a/toonz/sources/include/toonzqt/dvdialog.h b/toonz/sources/include/toonzqt/dvdialog.h index fb1bc74..b61e366 100644 --- a/toonz/sources/include/toonzqt/dvdialog.h +++ b/toonz/sources/include/toonzqt/dvdialog.h @@ -126,7 +126,7 @@ QString DVAPI getText(const QString &title, const QString &label, \b Result \image html DialogSeparator.jpg */ -class DVAPI Separator : public QFrame { +class DVAPI Separator final : public QFrame { Q_OBJECT QString m_name; @@ -243,7 +243,7 @@ signals: 0 -> Cancel or Close Popup, 1,2,3,... -> checkbox clicked. */ -class DVAPI RadioButtonDialog : public DVGui::Dialog { +class DVAPI RadioButtonDialog final : public DVGui::Dialog { Q_OBJECT int m_result; diff --git a/toonz/sources/include/toonzqt/dvscrollwidget.h b/toonz/sources/include/toonzqt/dvscrollwidget.h index e38d5bd..ddbaeeb 100644 --- a/toonz/sources/include/toonzqt/dvscrollwidget.h +++ b/toonz/sources/include/toonzqt/dvscrollwidget.h @@ -62,7 +62,7 @@ class QTimer; \sa The FreeLayout class. */ -class DVAPI DvScrollWidget : public QFrame { +class DVAPI DvScrollWidget final : public QFrame { Q_OBJECT QWidget *m_content; diff --git a/toonz/sources/include/toonzqt/dvtextedit.h b/toonz/sources/include/toonzqt/dvtextedit.h index 0490f0e..5b801d7 100644 --- a/toonz/sources/include/toonzqt/dvtextedit.h +++ b/toonz/sources/include/toonzqt/dvtextedit.h @@ -40,7 +40,7 @@ namespace DVGui { class ColorField; //----------------------------------------------------------------------------- -class DvMiniToolBar : public QFrame { +class DvMiniToolBar final : public QFrame { QPoint m_dragPos; public: @@ -54,7 +54,7 @@ protected: //----------------------------------------------------------------------------- -class DvTextEditButton : public QWidget { +class DvTextEditButton final : public QWidget { Q_OBJECT public: @@ -71,7 +71,7 @@ signals: //----------------------------------------------------------------------------- -class DVAPI DvTextEdit : public QTextEdit { +class DVAPI DvTextEdit final : public QTextEdit { Q_OBJECT bool m_paintMode; diff --git a/toonz/sources/include/toonzqt/expressionfield.h b/toonz/sources/include/toonzqt/expressionfield.h index 18f8e3b..f0787be 100644 --- a/toonz/sources/include/toonzqt/expressionfield.h +++ b/toonz/sources/include/toonzqt/expressionfield.h @@ -36,7 +36,7 @@ namespace DVGui { */ -class DVAPI ExpressionField : public QTextEdit { +class DVAPI ExpressionField final : public QTextEdit { Q_OBJECT bool m_editing; const TSyntax::Grammar *m_grammar; diff --git a/toonz/sources/include/toonzqt/flipconsole.h b/toonz/sources/include/toonzqt/flipconsole.h index 356d35b..f7d54e6 100644 --- a/toonz/sources/include/toonzqt/flipconsole.h +++ b/toonz/sources/include/toonzqt/flipconsole.h @@ -47,7 +47,7 @@ class FlipConsoleOwner; class TFrameHandle; //----------------------------------------------------------------------------- -class PlaybackExecutor : public QThread { +class PlaybackExecutor final : public QThread { Q_OBJECT int m_fps; @@ -71,7 +71,7 @@ signals: //----------------------------------------------------------------------------- // Implements a flipbook slider with a progress bar in background. -class FlipSlider : public QAbstractSlider { +class FlipSlider final : public QAbstractSlider { Q_OBJECT Q_PROPERTY(int PBHeight READ getPBHeight WRITE setPBHeight) @@ -179,7 +179,7 @@ signals: //----------------------------------------------------------------------------- -class DVAPI FlipConsole : public QWidget { +class DVAPI FlipConsole final : public QWidget { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/framenavigator.h b/toonz/sources/include/toonzqt/framenavigator.h index 2307265..34f6d8d 100644 --- a/toonz/sources/include/toonzqt/framenavigator.h +++ b/toonz/sources/include/toonzqt/framenavigator.h @@ -48,7 +48,7 @@ class TFrameHandle; (e.g. when \p m_frame is 0 then 1 is visualized). */ -class DVAPI FrameNavigator : public QToolBar { +class DVAPI FrameNavigator final : public QToolBar { Q_OBJECT TFrameHandle *m_frameHandle; diff --git a/toonz/sources/include/toonzqt/freelayout.h b/toonz/sources/include/toonzqt/freelayout.h index 94bc6ef..4f575a9 100644 --- a/toonz/sources/include/toonzqt/freelayout.h +++ b/toonz/sources/include/toonzqt/freelayout.h @@ -92,7 +92,7 @@ protected: scrollable environment. */ -class FreeLayout : public DummyLayout { +class FreeLayout final : public DummyLayout { public: FreeLayout() : DummyLayout() {} ~FreeLayout() {} diff --git a/toonz/sources/include/toonzqt/functionkeyframenavigator.h b/toonz/sources/include/toonzqt/functionkeyframenavigator.h index d593209..49403a2 100644 --- a/toonz/sources/include/toonzqt/functionkeyframenavigator.h +++ b/toonz/sources/include/toonzqt/functionkeyframenavigator.h @@ -11,7 +11,7 @@ class FunctionPanel; class TFrameHandle; class FrameNavigator; -class DVAPI FunctionKeyframeNavigator : public KeyframeNavigator { +class DVAPI FunctionKeyframeNavigator final : public KeyframeNavigator { Q_OBJECT TDoubleParamP m_curve; diff --git a/toonz/sources/include/toonzqt/functionpanel.h b/toonz/sources/include/toonzqt/functionpanel.h index 68cd44a..7b3ca62 100644 --- a/toonz/sources/include/toonzqt/functionpanel.h +++ b/toonz/sources/include/toonzqt/functionpanel.h @@ -29,7 +29,7 @@ class FunctionSelection; //----------------------------------------------------------------------------- //! Channel edit panel (numcols + graph popup) -class FunctionPanel : public QDialog { +class FunctionPanel final : public QDialog { Q_OBJECT QColor m_bgColor; diff --git a/toonz/sources/include/toonzqt/functionsegmentviewer.h b/toonz/sources/include/toonzqt/functionsegmentviewer.h index e7aabfa..5dee23b 100644 --- a/toonz/sources/include/toonzqt/functionsegmentviewer.h +++ b/toonz/sources/include/toonzqt/functionsegmentviewer.h @@ -33,7 +33,7 @@ class ExpressionField; //----------------------------------------------------------------------------- -class FunctionSegmentViewer : public QFrame, public TParamObserver { +class FunctionSegmentViewer final : public QFrame, public TParamObserver { Q_OBJECT TDoubleParam *m_curve; @@ -134,7 +134,7 @@ public slots: //----------------------------------------------------------------------------- -class SpeedInOutSegmentPage : public FunctionSegmentPage { +class SpeedInOutSegmentPage final : public FunctionSegmentPage { Q_OBJECT DVGui::LineEdit *m_speed0xFld; @@ -164,7 +164,7 @@ public slots: //----------------------------------------------------------------------------- -class EaseInOutSegmentPage : public FunctionSegmentPage { +class EaseInOutSegmentPage final : public FunctionSegmentPage { Q_OBJECT DVGui::MeasuredDoubleLineEdit *m_ease0Fld, *m_ease1Fld; double m_fieldScale; @@ -186,7 +186,7 @@ public slots: //----------------------------------------------------------------------------- -class FunctionExpressionSegmentPage : public FunctionSegmentPage { +class FunctionExpressionSegmentPage final : public FunctionSegmentPage { Q_OBJECT DVGui::ExpressionField *m_expressionFld; @@ -205,7 +205,7 @@ public: //----------------------------------------------------------------------------- -class SimilarShapeSegmentPage : public FunctionSegmentPage { +class SimilarShapeSegmentPage final : public FunctionSegmentPage { Q_OBJECT DVGui::ExpressionField *m_expressionFld; diff --git a/toonz/sources/include/toonzqt/functionselection.h b/toonz/sources/include/toonzqt/functionselection.h index e79f79f..711898f 100644 --- a/toonz/sources/include/toonzqt/functionselection.h +++ b/toonz/sources/include/toonzqt/functionselection.h @@ -37,7 +37,7 @@ public: //----------------------------------------------------------------------------- -class FunctionSelection : public QObject, public TSelection { +class FunctionSelection final : public QObject, public TSelection { Q_OBJECT QRect m_selectedCells; // yrange = rowrange of the selected keyframes; // xrange = columnrange (functionsheet only) @@ -115,7 +115,7 @@ signals: //----------------------------------------------------------------------------- -class FunctionKeyframesData : public DvMimeData { +class FunctionKeyframesData final : public DvMimeData { public: FunctionKeyframesData(); ~FunctionKeyframesData(); diff --git a/toonz/sources/include/toonzqt/functionsheet.h b/toonz/sources/include/toonzqt/functionsheet.h index ae3a7a3..a854752 100644 --- a/toonz/sources/include/toonzqt/functionsheet.h +++ b/toonz/sources/include/toonzqt/functionsheet.h @@ -27,7 +27,7 @@ class TDoubleParam; class TFrameHandle; class FunctionSelection; -class FunctionSheetRowViewer : public Spreadsheet::RowPanel { +class FunctionSheetRowViewer final : public Spreadsheet::RowPanel { FunctionSheet *m_sheet; public: @@ -42,7 +42,7 @@ protected: void contextMenuEvent(QContextMenuEvent *) override; }; -class FunctionSheetColumnHeadViewer : public Spreadsheet::ColumnPanel { +class FunctionSheetColumnHeadViewer final : public Spreadsheet::ColumnPanel { FunctionSheet *m_sheet; // enable drag and drop the expression arguments QPoint m_dragStartPosition; @@ -60,7 +60,7 @@ protected: void contextMenuEvent(QContextMenuEvent *) override; }; -class FunctionSheetCellViewer : public Spreadsheet::CellPanel { +class FunctionSheetCellViewer final : public Spreadsheet::CellPanel { Q_OBJECT FunctionSheet *m_sheet; DVGui::LineEdit *m_lineEdit; @@ -85,7 +85,7 @@ private slots: void onCellEditorEditingFinished(); }; -class FunctionSheet : public SpreadsheetViewer { +class FunctionSheet final : public SpreadsheetViewer { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/functiontoolbar.h b/toonz/sources/include/toonzqt/functiontoolbar.h index 90a84e1..28694de 100644 --- a/toonz/sources/include/toonzqt/functiontoolbar.h +++ b/toonz/sources/include/toonzqt/functiontoolbar.h @@ -54,7 +54,7 @@ public: // FunctionToolbar declaration //************************************************************************* -class FunctionToolbar : public DVGui::ToolBar, public TParamObserver { +class FunctionToolbar final : public DVGui::ToolBar, public TParamObserver { Q_OBJECT QToolBar *m_valueToolbar, *m_keyframeToolbar; diff --git a/toonz/sources/include/toonzqt/functiontreeviewer.h b/toonz/sources/include/toonzqt/functiontreeviewer.h index 507fbda..3996792 100644 --- a/toonz/sources/include/toonzqt/functiontreeviewer.h +++ b/toonz/sources/include/toonzqt/functiontreeviewer.h @@ -70,7 +70,7 @@ class FunctionViewer; TnzExt library). */ -class FunctionTreeModel : public TreeModel, public TParamObserver { +class FunctionTreeModel final : public TreeModel, public TParamObserver { Q_OBJECT public: @@ -153,7 +153,9 @@ color, which //---------------------------------------------------------------------------------- //! The model item representing a channel (i.e. a real-valued function). - class Channel : public ParamWrapper, public Item, public TParamObserver { + class Channel final : public ParamWrapper, + public Item, + public TParamObserver { FunctionTreeModel *m_model; //!< (\p not \p owned) Reference to the model ChannelGroup *m_group; //!< (\p not \p owned) Reference to the enclosing group @@ -312,7 +314,7 @@ public: //============================================================================= -class FxChannelGroup : public FunctionTreeModel::ChannelGroup { +class FxChannelGroup final : public FunctionTreeModel::ChannelGroup { public: TFx *m_fx; @@ -340,7 +342,7 @@ public: //! TreeView with stage object and fx channels. controls channel visibility and //! current channel -class FunctionTreeView : public TreeView { +class FunctionTreeView final : public TreeView { Q_OBJECT TFilePath m_scenePath; diff --git a/toonz/sources/include/toonzqt/functionviewer.h b/toonz/sources/include/toonzqt/functionviewer.h index 56c81b2..ed7b2d3 100644 --- a/toonz/sources/include/toonzqt/functionviewer.h +++ b/toonz/sources/include/toonzqt/functionviewer.h @@ -63,7 +63,7 @@ class ValueField; //************************************************************************ // Function editor widget -class DVAPI FunctionViewer : public QSplitter { +class DVAPI FunctionViewer final : public QSplitter { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/fxhistogramrender.h b/toonz/sources/include/toonzqt/fxhistogramrender.h index b968826..4d350ff 100644 --- a/toonz/sources/include/toonzqt/fxhistogramrender.h +++ b/toonz/sources/include/toonzqt/fxhistogramrender.h @@ -35,7 +35,7 @@ class ToonzScene; //! Implements the TRenderPort virtual class //! This class receives and handles signals from the TThread::Runnable class //! that make the render of frame. -class FxHistogramRenderPort : public QObject, public TRenderPort { +class FxHistogramRenderPort final : public QObject, public TRenderPort { Q_OBJECT public: @@ -56,7 +56,7 @@ signals: // FxHistogramRender //--------------------------------------------------------- -class DVAPI FxHistogramRender : public QObject { +class DVAPI FxHistogramRender final : public QObject { Q_OBJECT private: diff --git a/toonz/sources/include/toonzqt/fxschematicnode.h b/toonz/sources/include/toonzqt/fxschematicnode.h index 760426a..cf69b8c 100644 --- a/toonz/sources/include/toonzqt/fxschematicnode.h +++ b/toonz/sources/include/toonzqt/fxschematicnode.h @@ -58,7 +58,7 @@ enum eFxType { // FxColumnPainter //***************************************************** -class FxColumnPainter : public QObject, public QGraphicsItem { +class FxColumnPainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -91,7 +91,7 @@ protected: // FxPalettePainter //***************************************************** -class FxPalettePainter : public QGraphicsItem, public QObject { +class FxPalettePainter final : public QGraphicsItem, public QObject { FxSchematicPaletteNode *m_parent; double m_width, m_height; QString m_name; @@ -114,7 +114,7 @@ protected: // FxPainter //***************************************************** -class FxPainter : public QObject, public QGraphicsItem { +class FxPainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -147,7 +147,7 @@ protected: // FxXSheetPainter //***************************************************** -class FxXSheetPainter : public QObject, public QGraphicsItem { +class FxXSheetPainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -171,7 +171,7 @@ protected: // FxOutputPainter //***************************************************** -class FxOutputPainter : public QObject, public QGraphicsItem { +class FxOutputPainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -195,7 +195,7 @@ protected: // FxSchematicLink //***************************************************** -class FxSchematicLink : public SchematicLink { +class FxSchematicLink final : public SchematicLink { Q_OBJECT public: @@ -210,7 +210,7 @@ protected: // FxSchematicPort //***************************************************** -class FxSchematicPort : public SchematicPort { +class FxSchematicPort final : public SchematicPort { TFx *m_ownerFx; FxSchematicPort *m_currentTargetPort; QList m_hiddenLinks; @@ -256,7 +256,7 @@ private: // FxSchematicDock //***************************************************** -class FxSchematicDock : public QGraphicsItem, public QObject { +class FxSchematicDock final : public QGraphicsItem, public QObject { QString m_name; double m_width; FxSchematicPort *m_port; @@ -373,7 +373,7 @@ signals: // FxSchematicOutputNode //***************************************************** -class FxSchematicOutputNode : public FxSchematicNode { +class FxSchematicOutputNode final : public FxSchematicNode { FxOutputPainter *m_outputPainter; public: @@ -392,7 +392,7 @@ protected: // FxSchematicXSheetNode //***************************************************** -class FxSchematicXSheetNode : public FxSchematicNode { +class FxSchematicXSheetNode final : public FxSchematicNode { FxXSheetPainter *m_xsheetPainter; public: @@ -411,7 +411,7 @@ protected: // FxSchematicNormalFxNode //***************************************************** -class FxSchematicNormalFxNode : public FxSchematicNode { +class FxSchematicNormalFxNode final : public FxSchematicNode { Q_OBJECT FxPainter *m_painter; @@ -440,7 +440,7 @@ protected slots: // FxSchematicZeraryNode //***************************************************** -class FxSchematicZeraryNode : public FxSchematicNode { +class FxSchematicZeraryNode final : public FxSchematicNode { Q_OBJECT FxPainter *m_painter; @@ -473,7 +473,7 @@ protected slots: // FxSchematicColumnNode //***************************************************** -class FxSchematicColumnNode : public FxSchematicNode { +class FxSchematicColumnNode final : public FxSchematicNode { Q_OBJECT SchematicThumbnailToggle *m_resizeItem; @@ -515,7 +515,7 @@ protected slots: // FxSchematicPaletteNode //***************************************************** -class FxSchematicPaletteNode : public FxSchematicNode { +class FxSchematicPaletteNode final : public FxSchematicNode { Q_OBJECT SchematicToggle *m_renderToggle; @@ -551,7 +551,7 @@ private: // FxGroupNode //***************************************************** -class FxGroupNode : public FxSchematicNode { +class FxGroupNode final : public FxSchematicNode { Q_OBJECT QList m_groupedFxs; diff --git a/toonz/sources/include/toonzqt/fxschematicscene.h b/toonz/sources/include/toonzqt/fxschematicscene.h index a9cdc08..cd35c45 100644 --- a/toonz/sources/include/toonzqt/fxschematicscene.h +++ b/toonz/sources/include/toonzqt/fxschematicscene.h @@ -30,7 +30,7 @@ class TMacroFx; // //================================================================== -class FxSchematicScene : public SchematicScene { +class FxSchematicScene final : public SchematicScene { Q_OBJECT //---------------------------------------------------- diff --git a/toonz/sources/include/toonzqt/fxselection.h b/toonz/sources/include/toonzqt/fxselection.h index 9def0ce..69fa297 100644 --- a/toonz/sources/include/toonzqt/fxselection.h +++ b/toonz/sources/include/toonzqt/fxselection.h @@ -27,7 +27,7 @@ using namespace TFxCommand; // //--------------------------------------------------------- -class FxSelection : public QObject, public TSelection { +class FxSelection final : public QObject, public TSelection { Q_OBJECT QList m_selectedLinks; diff --git a/toonz/sources/include/toonzqt/fxsettings.h b/toonz/sources/include/toonzqt/fxsettings.h index f190a30..6f357c9 100644 --- a/toonz/sources/include/toonzqt/fxsettings.h +++ b/toonz/sources/include/toonzqt/fxsettings.h @@ -55,7 +55,7 @@ class ToonzScene; Inherits \b QWidget. */ -class DVAPI ParamsPage : public QFrame { +class DVAPI ParamsPage final : public QFrame { Q_OBJECT QColor m_textColor; /*-- 文字の色 デフォルト黒 --*/ @@ -126,7 +126,7 @@ public: Inherits \b QWidget. */ -class DVAPI ParamsPageSet : public QWidget { +class DVAPI ParamsPageSet final : public QWidget { Q_OBJECT TabBarContainter *m_tabBarContainer; @@ -186,7 +186,7 @@ protected slots: Inherits \b QWidget. */ -class DVAPI ParamViewer : public QFrame { +class DVAPI ParamViewer final : public QFrame { Q_OBJECT TFxP m_fx; @@ -230,7 +230,7 @@ signals: */ class QActionGroup; -class DVAPI FxSettings : public QSplitter { +class DVAPI FxSettings final : public QSplitter { Q_OBJECT QToolBar *m_toolBar; diff --git a/toonz/sources/include/toonzqt/gutil.h b/toonz/sources/include/toonzqt/gutil.h index 483a618..a7236fd 100644 --- a/toonz/sources/include/toonzqt/gutil.h +++ b/toonz/sources/include/toonzqt/gutil.h @@ -154,7 +154,7 @@ QPainterPath DVAPI strokeToPainterPath(TStroke *stroke); // using the styleSheet. // It is also used to take 6px on the left before the tabBar -class DVAPI TabBarContainter : public QFrame { +class DVAPI TabBarContainter final : public QFrame { public: TabBarContainter(QWidget *parent = 0); @@ -166,7 +166,7 @@ protected: // This widget is only used to set the background color of the playToolBar // using the styleSheet. And to put a line in the upper zone -class DVAPI ToolBarContainer : public QFrame { +class DVAPI ToolBarContainer final : public QFrame { public: ToolBarContainer(QWidget *parent = 0); diff --git a/toonz/sources/include/toonzqt/histogram.h b/toonz/sources/include/toonzqt/histogram.h index 8a967a2..1f464b6 100644 --- a/toonz/sources/include/toonzqt/histogram.h +++ b/toonz/sources/include/toonzqt/histogram.h @@ -34,7 +34,7 @@ class QColor; // HistogramGraph //----------------------------------------------------------------------------- -class DVAPI HistogramGraph : public QWidget { +class DVAPI HistogramGraph final : public QWidget { Q_OBJECT QColor m_color; @@ -72,7 +72,7 @@ protected: // ChannelBar //----------------------------------------------------------------------------- -class DVAPI ChannelBar : public QWidget { +class DVAPI ChannelBar final : public QWidget { Q_OBJECT QColor m_color; @@ -101,7 +101,7 @@ protected: // HistogramView //----------------------------------------------------------------------------- -class DVAPI HistogramView : public QWidget { +class DVAPI HistogramView final : public QWidget { Q_OBJECT HistogramGraph *m_histogramGraph; @@ -136,7 +136,7 @@ public: // Histograms //----------------------------------------------------------------------------- -class DVAPI Histograms : public QStackedWidget { +class DVAPI Histograms final : public QStackedWidget { Q_OBJECT TRasterP m_raster; @@ -163,7 +163,7 @@ protected: // Histogram //----------------------------------------------------------------------------- -class DVAPI Histogram : public QWidget { +class DVAPI Histogram final : public QWidget { Q_OBJECT QComboBox *m_channelsListBox; diff --git a/toonz/sources/include/toonzqt/icongenerator.h b/toonz/sources/include/toonzqt/icongenerator.h index c68d2b1..ef7f3a8 100644 --- a/toonz/sources/include/toonzqt/icongenerator.h +++ b/toonz/sources/include/toonzqt/icongenerator.h @@ -63,7 +63,7 @@ class TOfflineGL; once an icon has been generated. */ -class DVAPI IconGenerator : public QObject { +class DVAPI IconGenerator final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/imageutils.h b/toonz/sources/include/toonzqt/imageutils.h index 8aba5d4..357706d 100644 --- a/toonz/sources/include/toonzqt/imageutils.h +++ b/toonz/sources/include/toonzqt/imageutils.h @@ -41,7 +41,7 @@ namespace ImageUtils { /*! \brief Notify that a task on a single frame is completed. */ -class DVAPI FrameTaskNotifier : public QObject { +class DVAPI FrameTaskNotifier final : public QObject { Q_OBJECT int m_errorCount, m_warningCount; @@ -144,7 +144,7 @@ void DVAPI getStrokeStyleInformationInArea( widgets (specifically, context menus). */ -class DVAPI FullScreenWidget : public QWidget { +class DVAPI FullScreenWidget final : public QWidget { Q_OBJECT QWidget *m_widget; //!< (Owned) The content widget. diff --git a/toonz/sources/include/toonzqt/infoviewer.h b/toonz/sources/include/toonzqt/infoviewer.h index 5d42d6f..b646939 100644 --- a/toonz/sources/include/toonzqt/infoviewer.h +++ b/toonz/sources/include/toonzqt/infoviewer.h @@ -22,7 +22,7 @@ class TFilePath; class TPalette; class InfoViewerImp; -class DVAPI InfoViewer : public DVGui::Dialog { +class DVAPI InfoViewer final : public DVGui::Dialog { Q_OBJECT std::unique_ptr m_imp; QWidget *m_parent; diff --git a/toonz/sources/include/toonzqt/intfield.h b/toonz/sources/include/toonzqt/intfield.h index f18ae04..0974895 100644 --- a/toonz/sources/include/toonzqt/intfield.h +++ b/toonz/sources/include/toonzqt/intfield.h @@ -31,7 +31,7 @@ namespace DVGui { Inherits \b QWidget. */ -class DVAPI RollerField : public QWidget { +class DVAPI RollerField final : public QWidget { Q_OBJECT double m_value; diff --git a/toonz/sources/include/toonzqt/keyframenavigator.h b/toonz/sources/include/toonzqt/keyframenavigator.h index cf4c0bd..7760e7e 100644 --- a/toonz/sources/include/toonzqt/keyframenavigator.h +++ b/toonz/sources/include/toonzqt/keyframenavigator.h @@ -95,7 +95,7 @@ protected: // ViewerKeyframeNavigator //----------------------------------------------------------------------------- -class DVAPI ViewerKeyframeNavigator : public KeyframeNavigator { +class DVAPI ViewerKeyframeNavigator final : public KeyframeNavigator { Q_OBJECT TObjectHandle *m_objectHandle; @@ -141,7 +141,7 @@ protected: // PaletteKeyframeNavigator //----------------------------------------------------------------------------- -class DVAPI PaletteKeyframeNavigator : public KeyframeNavigator { +class DVAPI PaletteKeyframeNavigator final : public KeyframeNavigator { Q_OBJECT TPaletteHandle *m_paletteHandle; @@ -192,7 +192,7 @@ protected: // FxKeyframeNavigator //----------------------------------------------------------------------------- -class DVAPI FxKeyframeNavigator : public KeyframeNavigator { +class DVAPI FxKeyframeNavigator final : public KeyframeNavigator { Q_OBJECT TFxHandle *m_fxHandle; diff --git a/toonz/sources/include/toonzqt/marksbar.h b/toonz/sources/include/toonzqt/marksbar.h index 9db1ebd..1fffa41 100644 --- a/toonz/sources/include/toonzqt/marksbar.h +++ b/toonz/sources/include/toonzqt/marksbar.h @@ -26,7 +26,7 @@ /*! A MarksBar is a generalized slider with multiple values. */ -class DVAPI MarksBar : public QFrame { +class DVAPI MarksBar final : public QFrame { Q_OBJECT protected: diff --git a/toonz/sources/include/toonzqt/menubarcommand.h b/toonz/sources/include/toonzqt/menubarcommand.h index b60463e..869b1be 100644 --- a/toonz/sources/include/toonzqt/menubarcommand.h +++ b/toonz/sources/include/toonzqt/menubarcommand.h @@ -181,7 +181,7 @@ public: // template -class CommandHandlerHelper : public CommandHandlerInterface { +class CommandHandlerHelper final : public CommandHandlerInterface { T *m_target; void (T::*m_method)(); @@ -192,7 +192,7 @@ public: }; template -class CommandHandlerHelper2 : public CommandHandlerInterface { +class CommandHandlerHelper2 final : public CommandHandlerInterface { T *m_target; void (T::*m_method)(R value); R m_value; @@ -222,7 +222,7 @@ public: }; template -class OpenPopupCommandHandler : public MenuItemHandler { +class OpenPopupCommandHandler final : public MenuItemHandler { T *m_popup; CommandId m_id; @@ -240,7 +240,7 @@ public: //----------------------------------------------------------------------------- -class DVAPI DVAction : public QAction { +class DVAPI DVAction final : public QAction { Q_OBJECT public: DVAction(const QString &text, QObject *parent); @@ -252,7 +252,7 @@ public slots: //----------------------------------------------------------------------------- -class DVAPI DVMenuAction : public QMenu { +class DVAPI DVMenuAction final : public QMenu { Q_OBJECT int m_triggeredActionIndex; diff --git a/toonz/sources/include/toonzqt/paletteviewer.h b/toonz/sources/include/toonzqt/paletteviewer.h index 2daf91a..a42a069 100644 --- a/toonz/sources/include/toonzqt/paletteviewer.h +++ b/toonz/sources/include/toonzqt/paletteviewer.h @@ -40,7 +40,7 @@ class TXsheetHandle; // PaletteViewer //----------------------------------------------------------------------------- -class DVAPI PaletteViewer : public QFrame { +class DVAPI PaletteViewer final : public QFrame { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/paletteviewergui.h b/toonz/sources/include/toonzqt/paletteviewergui.h index 513635c..390722c 100644 --- a/toonz/sources/include/toonzqt/paletteviewergui.h +++ b/toonz/sources/include/toonzqt/paletteviewergui.h @@ -76,7 +76,7 @@ enum PaletteViewType //! Possible palette contents of a Palette Viewer. // PageViewer declaration //**************************************************************************** -class DVAPI PageViewer : public QFrame, public TSelection::View { +class DVAPI PageViewer final : public QFrame, public TSelection::View { Q_OBJECT QColor m_textColor; // text color used for list view @@ -237,7 +237,7 @@ signals: // PaletteTabBar declaration //**************************************************************************** -class DVAPI PaletteTabBar : public QTabBar { +class DVAPI PaletteTabBar final : public QTabBar { Q_OBJECT public: @@ -284,7 +284,7 @@ private: in the widgets hierarchy. */ -class DVAPI PaletteIconWidget : public QWidget { +class DVAPI PaletteIconWidget final : public QWidget { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/paramfield.h b/toonz/sources/include/toonzqt/paramfield.h index 1d42cc6..126cd18 100644 --- a/toonz/sources/include/toonzqt/paramfield.h +++ b/toonz/sources/include/toonzqt/paramfield.h @@ -103,7 +103,7 @@ signals: // ParamFieldKeyToggle //----------------------------------------------------------------------------- -class DVAPI ParamFieldKeyToggle : public QWidget { +class DVAPI ParamFieldKeyToggle final : public QWidget { Q_OBJECT public: @@ -136,7 +136,7 @@ signals: // FxSettingsKeyToggleUndo //============================================================================= template -class FxSettingsKeyToggleUndo : public TUndo { +class FxSettingsKeyToggleUndo final : public TUndo { TFxHandle *m_fxHandle; QString m_name; bool m_wasKeyframe; @@ -283,7 +283,7 @@ public: // MeasuredDoubleParamField //----------------------------------------------------------------------------- -class DVAPI MeasuredDoubleParamField +class DVAPI MeasuredDoubleParamField final : public AnimatedParamField { Q_OBJECT @@ -306,7 +306,7 @@ protected slots: // RangeParamField //----------------------------------------------------------------------------- -class DVAPI MeasuredRangeParamField +class DVAPI MeasuredRangeParamField final : public AnimatedParamField { Q_OBJECT @@ -330,7 +330,8 @@ protected slots: // PointParamField //----------------------------------------------------------------------------- -class DVAPI PointParamField : public AnimatedParamField { +class DVAPI PointParamField final + : public AnimatedParamField { Q_OBJECT DVGui::MeasuredDoubleField *m_xFld, *m_yFld; @@ -353,7 +354,7 @@ protected slots: // PixelParamField //----------------------------------------------------------------------------- -class DVAPI PixelParamField +class DVAPI PixelParamField final : public AnimatedParamField { Q_OBJECT @@ -382,7 +383,7 @@ protected slots: // RGB Link Button //----------------------------------------------------------------------------- -class DVAPI RgbLinkButton : public QPushButton { +class DVAPI RgbLinkButton final : public QPushButton { Q_OBJECT PixelParamField *m_field1, *m_field2; @@ -398,7 +399,7 @@ protected slots: // SpectrumParamField //----------------------------------------------------------------------------- -class DVAPI SpectrumParamField +class DVAPI SpectrumParamField final : public AnimatedParamField { Q_OBJECT @@ -425,7 +426,7 @@ protected slots: // EnumParamField //----------------------------------------------------------------------------- -class EnumParamField : public ParamField { +class EnumParamField final : public ParamField { Q_OBJECT TIntEnumParamP m_currentParam, m_actualParam; @@ -448,7 +449,7 @@ protected slots: // BoolParamField //----------------------------------------------------------------------------- -class DVAPI BoolParamField : public ParamField { +class DVAPI BoolParamField final : public ParamField { Q_OBJECT TBoolParamP m_currentParam, m_actualParam; @@ -475,7 +476,7 @@ signals: // IntParamField //----------------------------------------------------------------------------- -class DVAPI IntParamField : public ParamField { +class DVAPI IntParamField final : public ParamField { Q_OBJECT TIntParamP m_currentParam, m_actualParam; @@ -500,7 +501,7 @@ protected slots: // StringParamField //----------------------------------------------------------------------------- -class DVAPI StringParamField : public ParamField { +class DVAPI StringParamField final : public ParamField { Q_OBJECT TStringParamP m_currentParam, m_actualParam; @@ -522,7 +523,7 @@ protected slots: // ToneCurveParamField //----------------------------------------------------------------------------- -class DVAPI ToneCurveParamField +class DVAPI ToneCurveParamField final : public AnimatedParamField, TToneCurveParamP> { Q_OBJECT @@ -550,7 +551,7 @@ protected slots: }; namespace component { -class DVAPI LineEdit_double : public ParamField { +class DVAPI LineEdit_double final : public ParamField { Q_OBJECT; // could not use templates for Q_OBJECT int frame_; @@ -569,7 +570,7 @@ protected slots: void update_value(QString const &text); // could not use MACROs for slots }; -class DVAPI Slider_double : public ParamField { +class DVAPI Slider_double final : public ParamField { Q_OBJECT; int frame_; @@ -588,7 +589,7 @@ protected slots: void update_value(int); }; -class DVAPI SpinBox_double : public ParamField { +class DVAPI SpinBox_double final : public ParamField { Q_OBJECT; int frame_; @@ -609,7 +610,7 @@ protected slots: } namespace component { -class DVAPI LineEdit_int : public ParamField { +class DVAPI LineEdit_int final : public ParamField { Q_OBJECT; int frame_; @@ -628,7 +629,7 @@ protected slots: void update_value(QString const &text); }; -class DVAPI Slider_int : public ParamField { +class DVAPI Slider_int final : public ParamField { Q_OBJECT; int frame_; @@ -647,7 +648,7 @@ protected slots: void update_value(int); }; -class DVAPI SpinBox_int : public ParamField { +class DVAPI SpinBox_int final : public ParamField { Q_OBJECT; int frame_; @@ -669,7 +670,7 @@ protected slots: } // end of namespace component namespace component { -class DVAPI CheckBox_bool : public ParamField { +class DVAPI CheckBox_bool final : public ParamField { Q_OBJECT; int frame_; @@ -691,7 +692,7 @@ protected slots: } // end of namespace component namespace component { -class DVAPI RadioButton_enum : public ParamField { +class DVAPI RadioButton_enum final : public ParamField { Q_OBJECT; int frame_; @@ -710,7 +711,7 @@ protected slots: void update_value(int); }; -class DVAPI ComboBox_enum : public ParamField { +class DVAPI ComboBox_enum final : public ParamField { Q_OBJECT; int frame_; @@ -731,7 +732,7 @@ protected slots: } // end of namespace component namespace component { -class DVAPI LineEdit_string : public ParamField { +class DVAPI LineEdit_string final : public ParamField { Q_OBJECT; int frame_; diff --git a/toonz/sources/include/toonzqt/planeviewer.h b/toonz/sources/include/toonzqt/planeviewer.h index 8802dac..c53fe07 100644 --- a/toonz/sources/include/toonzqt/planeviewer.h +++ b/toonz/sources/include/toonzqt/planeviewer.h @@ -52,8 +52,8 @@ class TVectorImageP; */ /* -CAUTION : Changing PlaneViewer to inherit QOpenGLWidget causes crash bug with -shader fx for some unknown reasons. So I will reluctantly keep using the +CAUTION : Changing PlaneViewer to inherit QOpenGLWidget causes crash bug with +shader fx for some unknown reasons. So I will reluctantly keep using the obsolete class until the shader fx being overhauled. 2016/6/22 Shun */ diff --git a/toonz/sources/include/toonzqt/rasterimagedata.h b/toonz/sources/include/toonzqt/rasterimagedata.h index ad69f71..160f40b 100644 --- a/toonz/sources/include/toonzqt/rasterimagedata.h +++ b/toonz/sources/include/toonzqt/rasterimagedata.h @@ -71,7 +71,7 @@ public: // ToonzImageData //------------------------------------------------------------------- /*-- SelectionToolで選択した画像のデータ --*/ -class DVAPI ToonzImageData : public RasterImageData { +class DVAPI ToonzImageData final : public RasterImageData { TRasterCM32P m_copiedRaster; TPaletteP m_palette; @@ -106,7 +106,7 @@ public: // FullColorImageData //------------------------------------------------------------------- -class DVAPI FullColorImageData : public RasterImageData { +class DVAPI FullColorImageData final : public RasterImageData { TRasterP m_copiedRaster; TPaletteP m_palette; diff --git a/toonz/sources/include/toonzqt/schematicgroupeditor.h b/toonz/sources/include/toonzqt/schematicgroupeditor.h index 25259d9..5bf7ee3 100644 --- a/toonz/sources/include/toonzqt/schematicgroupeditor.h +++ b/toonz/sources/include/toonzqt/schematicgroupeditor.h @@ -83,7 +83,7 @@ private: // //===================================================== -class DVAPI FxSchematicGroupEditor : public SchematicWindowEditor { +class DVAPI FxSchematicGroupEditor final : public SchematicWindowEditor { Q_OBJECT int m_groupId; @@ -111,7 +111,7 @@ private: // //===================================================== -class DVAPI FxSchematicMacroEditor : public SchematicWindowEditor { +class DVAPI FxSchematicMacroEditor final : public SchematicWindowEditor { Q_OBJECT TMacroFx *m_macro; @@ -143,7 +143,7 @@ private: // //===================================================== -class DVAPI StageSchematicGroupEditor : public SchematicWindowEditor { +class DVAPI StageSchematicGroupEditor final : public SchematicWindowEditor { Q_OBJECT int m_groupId; diff --git a/toonz/sources/include/toonzqt/schematicnode.h b/toonz/sources/include/toonzqt/schematicnode.h index 7e0c771..709efef 100644 --- a/toonz/sources/include/toonzqt/schematicnode.h +++ b/toonz/sources/include/toonzqt/schematicnode.h @@ -15,7 +15,7 @@ class SchematicPort; // //======================================================== -class SchematicName : public QGraphicsTextItem { +class SchematicName final : public QGraphicsTextItem { Q_OBJECT double m_width; double m_height; @@ -47,7 +47,7 @@ protected slots: // //======================================================== -class SchematicThumbnailToggle : public QObject, public QGraphicsItem { +class SchematicThumbnailToggle final : public QObject, public QGraphicsItem { Q_OBJECT #ifndef MACOSX Q_INTERFACES(QGraphicsItem) @@ -131,7 +131,7 @@ signals: //======================================================== -class SchematicToggle_SplineOptions : public SchematicToggle { +class SchematicToggle_SplineOptions final : public SchematicToggle { Q_OBJECT public: SchematicToggle_SplineOptions(SchematicNode *parent, const QPixmap &pixmap, diff --git a/toonz/sources/include/toonzqt/schematicviewer.h b/toonz/sources/include/toonzqt/schematicviewer.h index 505f06a..5a221f5 100644 --- a/toonz/sources/include/toonzqt/schematicviewer.h +++ b/toonz/sources/include/toonzqt/schematicviewer.h @@ -97,7 +97,7 @@ protected slots: // //================================================================== -class DVAPI SchematicSceneViewer : public QGraphicsView { +class DVAPI SchematicSceneViewer final : public QGraphicsView { Q_OBJECT public: @@ -139,7 +139,7 @@ private: // //================================================================== -class DVAPI SchematicViewer : public QWidget { +class DVAPI SchematicViewer final : public QWidget { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/screenboard.h b/toonz/sources/include/toonzqt/screenboard.h index 030b618..47a63d5 100644 --- a/toonz/sources/include/toonzqt/screenboard.h +++ b/toonz/sources/include/toonzqt/screenboard.h @@ -70,7 +70,7 @@ list be refreshed to keep it to a minimum. */ -class DVAPI ScreenBoard : public QObject { +class DVAPI ScreenBoard final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/scriptconsole.h b/toonz/sources/include/toonzqt/scriptconsole.h index bc13912..0ee099c 100644 --- a/toonz/sources/include/toonzqt/scriptconsole.h +++ b/toonz/sources/include/toonzqt/scriptconsole.h @@ -18,7 +18,7 @@ class ScriptEngine; #define DVVAR DV_IMPORT_VAR #endif -class DVAPI ScriptConsole : public QTextEdit { +class DVAPI ScriptConsole final : public QTextEdit { Q_OBJECT ScriptEngine *m_engine; diff --git a/toonz/sources/include/toonzqt/spectrumfield.h b/toonz/sources/include/toonzqt/spectrumfield.h index 09ea03f..8f9bb7b 100644 --- a/toonz/sources/include/toonzqt/spectrumfield.h +++ b/toonz/sources/include/toonzqt/spectrumfield.h @@ -28,7 +28,7 @@ namespace DVGui { // SpectrumBar //----------------------------------------------------------------------------- -class DVAPI SpectrumBar : public QWidget { +class DVAPI SpectrumBar final : public QWidget { Q_OBJECT int m_x0; @@ -89,7 +89,7 @@ protected: // SpectrumField //----------------------------------------------------------------------------- -class DVAPI SpectrumField : public QWidget { +class DVAPI SpectrumField final : public QWidget { Q_OBJECT int m_margin; diff --git a/toonz/sources/include/toonzqt/spreadsheetviewer.h b/toonz/sources/include/toonzqt/spreadsheetviewer.h index a7b9e79..9e95be4 100644 --- a/toonz/sources/include/toonzqt/spreadsheetviewer.h +++ b/toonz/sources/include/toonzqt/spreadsheetviewer.h @@ -63,7 +63,7 @@ public: //------------------------------------------------------------------- -class DVAPI SetFrameDragTool : public DragTool { +class DVAPI SetFrameDragTool final : public DragTool { TFrameHandle *m_frameHandle; public: @@ -76,7 +76,7 @@ public: //------------------------------------------------------------------- -class DVAPI SelectionDragTool : public DragTool { +class DVAPI SelectionDragTool final : public DragTool { SpreadsheetViewer *m_viewer; int m_firstRow, m_firstCol; @@ -90,7 +90,7 @@ public: //------------------------------------------------------------------- -class DVAPI PanTool : public DragTool { +class DVAPI PanTool final : public DragTool { SpreadsheetViewer *m_viewer; GenericPanel *m_panel; QPoint m_lastPos; @@ -105,7 +105,7 @@ public: //------------------------------------------------------------------- -class DVAPI ScrollArea : public QScrollArea { +class DVAPI ScrollArea final : public QScrollArea { Q_OBJECT public: diff --git a/toonz/sources/include/toonzqt/stageobjectsdata.h b/toonz/sources/include/toonzqt/stageobjectsdata.h index 4e5522c..8b2803f 100644 --- a/toonz/sources/include/toonzqt/stageobjectsdata.h +++ b/toonz/sources/include/toonzqt/stageobjectsdata.h @@ -50,7 +50,7 @@ class TFxSet; //! StageObjectsData is the class used to store multiple schematic stage //! object's relational data. -class DVAPI StageObjectsData : public DvMimeData { +class DVAPI StageObjectsData final : public DvMimeData { QList m_elements; //!< The collection of single stage object //!< relational data (owned) diff --git a/toonz/sources/include/toonzqt/stageschematicnode.h b/toonz/sources/include/toonzqt/stageschematicnode.h index 850f899..c70a8c2 100644 --- a/toonz/sources/include/toonzqt/stageschematicnode.h +++ b/toonz/sources/include/toonzqt/stageschematicnode.h @@ -39,7 +39,7 @@ enum eStageSchematicPortType { // //======================================================== -class ColumnPainter : public QObject, public QGraphicsItem { +class ColumnPainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -72,7 +72,7 @@ public slots: // //======================================================== -class GroupPainter : public QObject, public QGraphicsItem { +class GroupPainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -99,7 +99,7 @@ protected: // //======================================================== -class PegbarPainter : public QObject, public QGraphicsItem { +class PegbarPainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -126,7 +126,7 @@ protected: // //======================================================== -class CameraPainter : public QObject, public QGraphicsItem { +class CameraPainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -154,7 +154,7 @@ protected: // //======================================================== -class TablePainter : public QObject, public QGraphicsItem { +class TablePainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -178,7 +178,7 @@ protected: // //======================================================== -class SplinePainter : public QObject, public QGraphicsItem { +class SplinePainter final : public QObject, public QGraphicsItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -205,7 +205,7 @@ protected: // //======================================================== -class StageSchematicNodePort : public SchematicPort { +class StageSchematicNodePort final : public SchematicPort { QString m_handle; public: @@ -232,7 +232,7 @@ private: // //======================================================== -class StageSchematicSplinePort : public SchematicPort { +class StageSchematicSplinePort final : public SchematicPort { StageSchematicSplineDock *m_parent; QPixmap m_squarePixmap, m_rhombPixmap; @@ -257,7 +257,7 @@ private: // //======================================================== -class SplineAimChanger : public SchematicHandleSpinBox { +class SplineAimChanger final : public SchematicHandleSpinBox { bool m_aim; public: @@ -278,7 +278,7 @@ protected: // //======================================================== -class StageSchematicNodeDock : public QObject, public QGraphicsItem { +class StageSchematicNodeDock final : public QObject, public QGraphicsItem { Q_OBJECT #ifndef MACOSX Q_INTERFACES(QGraphicsItem) @@ -329,7 +329,7 @@ protected slots: // //======================================================== -class StageSchematicSplineDock : public QObject, public QGraphicsItem { +class StageSchematicSplineDock final : public QObject, public QGraphicsItem { Q_OBJECT #ifndef MACOSX Q_INTERFACES(QGraphicsItem) @@ -412,7 +412,7 @@ protected slots: // //======================================================== -class StageSchematicPegbarNode : public StageSchematicNode { +class StageSchematicPegbarNode final : public StageSchematicNode { Q_OBJECT PegbarPainter *m_pegbarPainter; @@ -438,7 +438,7 @@ protected slots: // //======================================================== -class StageSchematicTableNode : public StageSchematicNode { +class StageSchematicTableNode final : public StageSchematicNode { TablePainter *m_tablePainter; public: @@ -456,7 +456,7 @@ public: // //======================================================== -class StageSchematicColumnNode : public StageSchematicNode { +class StageSchematicColumnNode final : public StageSchematicNode { Q_OBJECT SchematicThumbnailToggle *m_resizeItem; @@ -496,7 +496,7 @@ protected slots: // //======================================================== -class StageSchematicCameraNode : public StageSchematicNode { +class StageSchematicCameraNode final : public StageSchematicNode { Q_OBJECT CameraPainter *m_cameraPainter; @@ -522,7 +522,7 @@ protected slots: // //======================================================== -class StageSchematicSplineNode : public SchematicNode { +class StageSchematicSplineNode final : public SchematicNode { Q_OBJECT TStageObjectSpline *m_spline; @@ -569,7 +569,7 @@ protected slots: // //======================================================== -class StageSchematicGroupNode : public StageSchematicNode { +class StageSchematicGroupNode final : public StageSchematicNode { Q_OBJECT GroupPainter *m_painter; diff --git a/toonz/sources/include/toonzqt/stageschematicscene.h b/toonz/sources/include/toonzqt/stageschematicscene.h index 28df505..6b04414 100644 --- a/toonz/sources/include/toonzqt/stageschematicscene.h +++ b/toonz/sources/include/toonzqt/stageschematicscene.h @@ -81,7 +81,7 @@ public: //! To regenearte the scene use the updateScene().\n //! To oreder nodes in the scene use the reorderScene(). -class StageSchematicScene : public SchematicScene { +class StageSchematicScene final : public SchematicScene { Q_OBJECT TXsheetHandle *m_xshHandle; TObjectHandle *m_objHandle; diff --git a/toonz/sources/include/toonzqt/strokesdata.h b/toonz/sources/include/toonzqt/strokesdata.h index 1eab72b..687e515 100644 --- a/toonz/sources/include/toonzqt/strokesdata.h +++ b/toonz/sources/include/toonzqt/strokesdata.h @@ -26,7 +26,7 @@ class FullColorImageData; // StrokesData //----------------------------------------------------------------------------- -class DVAPI StrokesData : public DvMimeData { +class DVAPI StrokesData final : public DvMimeData { public: TVectorImageP m_image; diff --git a/toonz/sources/include/toonzqt/studiopaletteviewer.h b/toonz/sources/include/toonzqt/studiopaletteviewer.h index 87f323b..14460d5 100644 --- a/toonz/sources/include/toonzqt/studiopaletteviewer.h +++ b/toonz/sources/include/toonzqt/studiopaletteviewer.h @@ -39,9 +39,9 @@ class TXshLevelHandle; folder and current project palette folder, the three root folder of \b StudioPalette. */ -class DVAPI StudioPaletteTreeViewer : public QTreeWidget, - public StudioPalette::Listener, - public TProjectManager::Listener { +class DVAPI StudioPaletteTreeViewer final : public QTreeWidget, + public StudioPalette::Listener, + public TProjectManager::Listener { Q_OBJECT TPaletteP m_currentPalette; @@ -203,7 +203,7 @@ protected: allows to show and modify current studio palette selected in tree. */ -class DVAPI StudioPaletteViewer : public QSplitter { +class DVAPI StudioPaletteViewer final : public QSplitter { Q_OBJECT StudioPaletteTreeViewer *m_studioPaletteTreeViewer; diff --git a/toonz/sources/include/toonzqt/styleeditor.h b/toonz/sources/include/toonzqt/styleeditor.h index 86a3a15..251e7d7 100644 --- a/toonz/sources/include/toonzqt/styleeditor.h +++ b/toonz/sources/include/toonzqt/styleeditor.h @@ -135,7 +135,7 @@ public: enum CurrentWheel { none, leftWheel, rightTriangle }; -class DVAPI HexagonalColorWheel : public QOpenGLWidget { +class DVAPI HexagonalColorWheel final : public QOpenGLWidget { Q_OBJECT // backgoround color (R160, G160, B160) @@ -192,7 +192,7 @@ signals: It's possible to choose viewed shade using \b setChannel(). Click in square change current SquaredColorWheel. */ -class DVAPI SquaredColorWheel : public QWidget { +class DVAPI SquaredColorWheel final : public QWidget { Q_OBJECT ColorChannel m_channel; ColorModel m_color; @@ -235,7 +235,7 @@ signals: maximum channel color value. */ -class DVAPI ColorSlider : public QSlider { +class DVAPI ColorSlider final : public QSlider { Q_OBJECT public: ColorSlider(Qt::Orientation orientation, QWidget *parent = 0); @@ -264,7 +264,7 @@ private: //============================================================================= // ArrowButton -class ArrowButton : public QToolButton { +class ArrowButton final : public QToolButton { Q_OBJECT Qt::Orientation m_orientaion; @@ -297,7 +297,7 @@ signals: Inherits \b QToolBar. */ -class DVAPI ColorSliderBar : public QWidget { +class DVAPI ColorSliderBar final : public QWidget { Q_OBJECT ColorSlider *m_colorSlider; @@ -334,7 +334,7 @@ signals: value. It calls selectAll() at the moment of the first click. */ -class ChannelLineEdit : public DVGui::IntLineEdit { +class ChannelLineEdit final : public DVGui::IntLineEdit { Q_OBJECT bool m_isEditing; @@ -360,7 +360,7 @@ protected: ColorSlider to show/edit the channel value. */ -class DVAPI ColorChannelControl : public QWidget { +class DVAPI ColorChannelControl final : public QWidget { Q_OBJECT QLabel *m_label; ChannelLineEdit *m_field; @@ -405,7 +405,7 @@ public: Inherits \b QWidget. */ -class ColorParameterSelector : public QWidget { +class ColorParameterSelector final : public QWidget { Q_OBJECT std::vector m_colors; @@ -438,7 +438,7 @@ protected: button (to control the ColorWheel behaviour). */ -class PlainColorPage : public StyleEditorPage { +class PlainColorPage final : public StyleEditorPage { Q_OBJECT // ColorSliderBar *m_verticalSlider; @@ -534,7 +534,7 @@ signals: style are \a not performed directly by this class. */ -class SettingsPage : public QScrollArea { +class SettingsPage final : public QScrollArea { Q_OBJECT QGridLayout *m_paramsLayout; @@ -577,7 +577,7 @@ using namespace StyleEditorGUI; // StyleEditor //----------------------------------------------------------------------------- -class DVAPI StyleEditor : public QWidget { +class DVAPI StyleEditor final : public QWidget { Q_OBJECT PaletteController *m_paletteController; diff --git a/toonz/sources/include/toonzqt/stylenameeditor.h b/toonz/sources/include/toonzqt/stylenameeditor.h index 3acab4a..bad58ef 100644 --- a/toonz/sources/include/toonzqt/stylenameeditor.h +++ b/toonz/sources/include/toonzqt/stylenameeditor.h @@ -9,7 +9,7 @@ class QLineEdit; class QPushButton; class TPaletteHandle; -class StyleNameEditor : public QDialog // singleton +class StyleNameEditor final : public QDialog // singleton { Q_OBJECT diff --git a/toonz/sources/include/toonzqt/styleselection.h b/toonz/sources/include/toonzqt/styleselection.h index 68f883a..fb78637 100644 --- a/toonz/sources/include/toonzqt/styleselection.h +++ b/toonz/sources/include/toonzqt/styleselection.h @@ -28,7 +28,7 @@ class TXshLevelHandle; // TStyleSelection //----------------------------------------------------------------------------- -class DVAPI TStyleSelection : public TSelection { +class DVAPI TStyleSelection final : public TSelection { TPaletteHandle *m_paletteHandle; // Used to change level palette; in other palette (cleanup, ...) xsheetHandle diff --git a/toonz/sources/include/toonzqt/swatchviewer.h b/toonz/sources/include/toonzqt/swatchviewer.h index 9148f8e..501ccca 100644 --- a/toonz/sources/include/toonzqt/swatchviewer.h +++ b/toonz/sources/include/toonzqt/swatchviewer.h @@ -42,7 +42,7 @@ public: //============================================================================= -class DVAPI SolidColorBgPainter : public BgPainter { +class DVAPI SolidColorBgPainter final : public BgPainter { TPixel32 m_color; public: @@ -54,7 +54,7 @@ public: //============================================================================= -class DVAPI CheckboardBgPainter : public BgPainter { +class DVAPI CheckboardBgPainter final : public BgPainter { TPixel32 m_c0, m_c1; public: @@ -75,7 +75,7 @@ public: Inherits \b QWidget. */ -class DVAPI SwatchViewer : public QWidget { +class DVAPI SwatchViewer final : public QWidget { Q_OBJECT //! La classe \b Point gestisce un punto che e' collegato a parametri \b @@ -132,7 +132,7 @@ class DVAPI SwatchViewer : public QWidget { friend class ContentRender; public: - class ContentRender : public TThread::Runnable { + class ContentRender final : public TThread::Runnable { public: TRasterFxP m_fx; TRasterP m_raster; diff --git a/toonz/sources/include/toonzqt/tabbar.h b/toonz/sources/include/toonzqt/tabbar.h index aa92791..3ff5245 100644 --- a/toonz/sources/include/toonzqt/tabbar.h +++ b/toonz/sources/include/toonzqt/tabbar.h @@ -33,7 +33,7 @@ namespace DVGui { using \b addIconTab(), it's anyhow possible add text tab using \b addSimpleTab(). */ -class DVAPI TabBar : public QTabBar { +class DVAPI TabBar final : public QTabBar { Q_OBJECT std::vector m_pixmaps; diff --git a/toonz/sources/include/toonzqt/tmessageviewer.h b/toonz/sources/include/toonzqt/tmessageviewer.h index d5ad943..abbd2ef 100644 --- a/toonz/sources/include/toonzqt/tmessageviewer.h +++ b/toonz/sources/include/toonzqt/tmessageviewer.h @@ -21,7 +21,7 @@ class MySortFilterProxyModel; class QCheckBox; class QStandardItemModel; -class DVAPI TMessageRepository : public QObject { +class DVAPI TMessageRepository final : public QObject { QStandardItemModel *m_sim; Q_OBJECT @@ -41,7 +41,7 @@ signals: //--------------------------------------------------------------------------------------- -class DVAPI TMessageViewer : public QFrame { +class DVAPI TMessageViewer final : public QFrame { Q_OBJECT protected: diff --git a/toonz/sources/include/toonzqt/tonecurvefield.h b/toonz/sources/include/toonzqt/tonecurvefield.h index 705441b..a93c7db 100644 --- a/toonz/sources/include/toonzqt/tonecurvefield.h +++ b/toonz/sources/include/toonzqt/tonecurvefield.h @@ -35,7 +35,7 @@ class CheckBox; // ChennelCurveEditor //----------------------------------------------------------------------------- -class DVAPI ChennelCurveEditor : public QWidget { +class DVAPI ChennelCurveEditor final : public QWidget { Q_OBJECT HistogramView *m_histogramView; @@ -119,7 +119,7 @@ signals: // ToneCurveField //----------------------------------------------------------------------------- -class DVAPI ToneCurveField : public QWidget { +class DVAPI ToneCurveField final : public QWidget { Q_OBJECT QStackedWidget *m_toneCurveStackedWidget; diff --git a/toonz/sources/include/toonzqt/treemodel.h b/toonz/sources/include/toonzqt/treemodel.h index 3c6ffd8..1193124 100644 --- a/toonz/sources/include/toonzqt/treemodel.h +++ b/toonz/sources/include/toonzqt/treemodel.h @@ -151,7 +151,7 @@ public: protected: /* -class Delegate : public QItemDelegate +class Delegate final : public QItemDelegate { public: Delegate(TreeView *parent) : QItemDelegate(parent), m_treeView(parent) {} diff --git a/toonz/sources/include/toonzqt/tselectionhandle.h b/toonz/sources/include/toonzqt/tselectionhandle.h index b5731ad..d043fd3 100644 --- a/toonz/sources/include/toonzqt/tselectionhandle.h +++ b/toonz/sources/include/toonzqt/tselectionhandle.h @@ -28,7 +28,7 @@ class CommandHandlerInterface; // TSelectionHandle //----------------------------------------------------------------------------- -class DVAPI TSelectionHandle : public QObject { +class DVAPI TSelectionHandle final : public QObject { Q_OBJECT std::vector m_selectionStack; diff --git a/toonz/sources/include/toonzqt/updatechecker.h b/toonz/sources/include/toonzqt/updatechecker.h index 9e4186b..71f8d36 100644 --- a/toonz/sources/include/toonzqt/updatechecker.h +++ b/toonz/sources/include/toonzqt/updatechecker.h @@ -21,7 +21,7 @@ #define DVVAR DV_IMPORT_VAR #endif -class DVAPI UpdateChecker : public QObject { +class DVAPI UpdateChecker final : public QObject { Q_OBJECT QSharedPointer manager_; diff --git a/toonz/sources/include/tpalette.h b/toonz/sources/include/tpalette.h index 112c07a..bf16794 100644 --- a/toonz/sources/include/tpalette.h +++ b/toonz/sources/include/tpalette.h @@ -82,7 +82,7 @@ ASAP. \sa The TColorStyle class. */ -class DVAPI TPalette : public TPersist, public TSmartObject { +class DVAPI TPalette final : public TPersist, public TSmartObject { DECLARE_CLASS_CODE PERSIST_DECLARATION(TPalette); diff --git a/toonz/sources/include/tparam.h b/toonz/sources/include/tparam.h index c02e790..da957f3 100644 --- a/toonz/sources/include/tparam.h +++ b/toonz/sources/include/tparam.h @@ -186,7 +186,7 @@ typedef TSmartPointerT TParamP; #define DEFINE_PARAM_SMARTPOINTER(PARAM, TYPE) \ DVAPI_PARAM_SMARTPOINTER(PARAM) \ \ - class DVAPI PARAM##P : public TDerivedSmartPointerT { \ + class DVAPI PARAM##P final : public TDerivedSmartPointerT { \ public: \ PARAM##P(PARAM *p = 0) : DerivedSmartPointer(p) {} \ PARAM##P(TYPE v) : DerivedSmartPointer(new PARAM(v)) {} \ diff --git a/toonz/sources/include/tparamcontainer.h b/toonz/sources/include/tparamcontainer.h index 4313a8c..8077fd7 100644 --- a/toonz/sources/include/tparamcontainer.h +++ b/toonz/sources/include/tparamcontainer.h @@ -43,7 +43,7 @@ public: }; template -class TParamVarT : public TParamVar { +class TParamVarT final : public TParamVar { TParamP m_var; public: diff --git a/toonz/sources/include/tparamset.h b/toonz/sources/include/tparamset.h index 6c0363c..d4c213e 100644 --- a/toonz/sources/include/tparamset.h +++ b/toonz/sources/include/tparamset.h @@ -23,7 +23,7 @@ class TParamSetImp; -class TParamSetChange : public TParamChange { +class TParamSetChange final : public TParamChange { public: std::vector m_paramChanges; @@ -137,7 +137,7 @@ template class DVAPI TPersistDeclarationT; class TPointParamImp; class TDoubleParamP; -class DVAPI TPointParam : public TParamSet { +class DVAPI TPointParam final : public TParamSet { PERSIST_DECLARATION(TPointParam) TPointParamImp *m_data; bool m_from_plugin; @@ -184,7 +184,7 @@ public: class TPixelParamImp; -class DVAPI TPixelParam : public TParamSet { +class DVAPI TPixelParam final : public TParamSet { PERSIST_DECLARATION(TPixelParam) TPixelParamImp *m_data; @@ -242,7 +242,7 @@ template class DVAPI TPersistDeclarationT; class TRangeParamImp; class TDoubleParamP; -class DVAPI TRangeParam : public TParamSet { +class DVAPI TRangeParam final : public TParamSet { PERSIST_DECLARATION(TRangeParam) TRangeParamImp *m_data; diff --git a/toonz/sources/include/tpassivecachemanager.h b/toonz/sources/include/tpassivecachemanager.h index 2970247..0398fcb 100644 --- a/toonz/sources/include/tpassivecachemanager.h +++ b/toonz/sources/include/tpassivecachemanager.h @@ -33,7 +33,7 @@ under control of another manager class - namely, the TFxCacheManager - for single render instances. */ -class DVAPI TPassiveCacheManager : public TFxCacheManagerDelegate { +class DVAPI TPassiveCacheManager final : public TFxCacheManagerDelegate { T_RENDER_RESOURCE_MANAGER private: diff --git a/toonz/sources/include/tpersist.h b/toonz/sources/include/tpersist.h index 698191c..c5b15b8 100644 --- a/toonz/sources/include/tpersist.h +++ b/toonz/sources/include/tpersist.h @@ -67,7 +67,7 @@ object. This method is overridden with the macro PERSIST_DECLARATION(T). \n For example: \code -class DVAPI TStageObjectTree : public TPersist { +class DVAPI TStageObjectTree final : public TPersist { PERSIST_DECLARATION(TStageObjectTree) public: @@ -116,7 +116,7 @@ inline std::string TPersist::getStreamTag() const { T. */ template -class TPersistDeclarationT : public TPersistDeclaration { +class TPersistDeclarationT final : public TPersistDeclaration { public: /*! This is the constructor. Its argument is the id of the object. @@ -147,7 +147,9 @@ private: \ static TPersistDeclarationT m_declaration; \ \ public: \ - const TPersistDeclaration *getDeclaration() const override { return &m_declaration; } + const TPersistDeclaration *getDeclaration() const override { \ + return &m_declaration; \ + } #define PERSIST_IDENTIFIER(T, I) TPersistDeclarationT T::m_declaration(I); diff --git a/toonz/sources/include/tpersistset.h b/toonz/sources/include/tpersistset.h index d88f0a9..b787905 100644 --- a/toonz/sources/include/tpersistset.h +++ b/toonz/sources/include/tpersistset.h @@ -25,7 +25,7 @@ configuration options, without discarding the other objects. */ -class DVAPI TPersistSet : public TPersist { +class DVAPI TPersistSet final : public TPersist { PERSIST_DECLARATION(TPersistSet) std::vector m_objects; //!< #owned# Stored objects. diff --git a/toonz/sources/include/tpredictivecachemanager.h b/toonz/sources/include/tpredictivecachemanager.h index 3232f18..40f126f 100644 --- a/toonz/sources/include/tpredictivecachemanager.h +++ b/toonz/sources/include/tpredictivecachemanager.h @@ -32,7 +32,7 @@ intermediate render results due to predictive analysis of the scene schematic. */ -class DVAPI TPredictiveCacheManager : public TFxCacheManagerDelegate { +class DVAPI TPredictiveCacheManager final : public TFxCacheManagerDelegate { T_RENDER_RESOURCE_MANAGER class Imp; diff --git a/toonz/sources/include/tproperty.h b/toonz/sources/include/tproperty.h index 8395697..202eced 100644 --- a/toonz/sources/include/tproperty.h +++ b/toonz/sources/include/tproperty.h @@ -102,7 +102,7 @@ private: //--------------------------------------------------------- template -class TRangeProperty : public TProperty { +class TRangeProperty final : public TProperty { public: typedef std::pair Range; @@ -150,7 +150,7 @@ template class DVAPI TRangeProperty; #endif //--------------------------------------------------------- -class TDoublePairProperty : public TProperty { +class TDoublePairProperty final : public TProperty { public: typedef std::pair Range; typedef std::pair Value; @@ -191,7 +191,7 @@ private: //--------------------------------------------------------- -class TIntPairProperty : public TProperty { +class TIntPairProperty final : public TProperty { public: typedef std::pair Range; typedef std::pair Value; @@ -232,7 +232,7 @@ private: //--------------------------------------------------------- -class DVAPI TBoolProperty : public TProperty { +class DVAPI TBoolProperty final : public TProperty { public: TBoolProperty(std::string name, bool value) : TProperty(name), m_value(value) {} @@ -250,7 +250,7 @@ private: //--------------------------------------------------------- -class DVAPI TStringProperty : public TProperty { +class DVAPI TStringProperty final : public TProperty { public: TStringProperty(std::string name, std::wstring value) : TProperty(name), m_value(value) {} @@ -268,7 +268,7 @@ private: //--------------------------------------------------------- -class DVAPI TStyleIndexProperty : public TProperty { +class DVAPI TStyleIndexProperty final : public TProperty { public: TStyleIndexProperty(std::string name, std::wstring value) : TProperty(name), m_value(value) {} @@ -288,7 +288,7 @@ private: //------------------------------------------------------------------ -class DVAPI TPointerProperty : public TProperty { +class DVAPI TPointerProperty final : public TProperty { public: TPointerProperty(std::string name, void *value) : TProperty(name), m_value(value) {} @@ -308,7 +308,7 @@ private: //--------------------------------------------------------- -class DVAPI TEnumProperty : public TProperty { +class DVAPI TEnumProperty final : public TProperty { public: typedef std::vector Range; diff --git a/toonz/sources/include/traster.h b/toonz/sources/include/traster.h index 07a252a..d55c324 100644 --- a/toonz/sources/include/traster.h +++ b/toonz/sources/include/traster.h @@ -237,7 +237,7 @@ class TRasterT; //! \include rasterpt_ex1.cpp // class TRasterPT template -class TRasterPT : public TSmartPointerT> { +class TRasterPT final : public TSmartPointerT> { public: typedef T Pixel; typedef TRasterT Raster; diff --git a/toonz/sources/include/trasterfx.h b/toonz/sources/include/trasterfx.h index b933d41..43d126d 100644 --- a/toonz/sources/include/trasterfx.h +++ b/toonz/sources/include/trasterfx.h @@ -305,7 +305,7 @@ template class DVAPI TDerivedSmartPointerT; //------------------------------------------------------------------- -class DVAPI TRasterFxP : public TDerivedSmartPointerT { +class DVAPI TRasterFxP final : public TDerivedSmartPointerT { public: TRasterFxP() {} TRasterFxP(TRasterFx *fx) : DerivedSmartPointer(fx) {} @@ -358,7 +358,8 @@ template class DVAPI TDerivedSmartPointerT; //------------------------------------------------------------------- -class DVAPI TGeometryFxP : public TDerivedSmartPointerT { +class DVAPI TGeometryFxP final + : public TDerivedSmartPointerT { public: TGeometryFxP() {} TGeometryFxP(TGeometryFx *fx) : DerivedSmartPointer(fx) {} @@ -376,7 +377,7 @@ public: template class DVAPI TFxPortT; #endif -class DVAPI TGeometryPort : public TFxPortT { +class DVAPI TGeometryPort final : public TFxPortT { public: TGeometryPort() : TFxPortT(true) {} TAffine getPlacement(double frame) { return m_fx->getPlacement(frame); } @@ -386,7 +387,7 @@ public: // NaAffineFx declaration //****************************************************************************** -class DVAPI NaAffineFx : public TGeometryFx { +class DVAPI NaAffineFx final : public TGeometryFx { FX_DECLARATION(NaAffineFx) public: ~NaAffineFx() {} diff --git a/toonz/sources/include/trasterimage.h b/toonz/sources/include/trasterimage.h index 56c4bfa..3607954 100644 --- a/toonz/sources/include/trasterimage.h +++ b/toonz/sources/include/trasterimage.h @@ -25,7 +25,7 @@ \include rasterImage_ex.cpp */ -class DVAPI TRasterImage : public TImage { +class DVAPI TRasterImage final : public TImage { TRasterP m_mainRaster, m_patchRaster, m_iconRaster; //! dpi value for x axis @@ -144,7 +144,8 @@ template class DVAPI TSmartPointerT; template class DVAPI TDerivedSmartPointerT; #endif -class DVAPI TRasterImageP : public TDerivedSmartPointerT { +class DVAPI TRasterImageP final + : public TDerivedSmartPointerT { public: TRasterImageP() {} TRasterImageP(TRasterImage *image) : DerivedSmartPointer(image) {} diff --git a/toonz/sources/include/tregion.h b/toonz/sources/include/tregion.h index eddaa0f..f2ae4c9 100644 --- a/toonz/sources/include/tregion.h +++ b/toonz/sources/include/tregion.h @@ -65,7 +65,7 @@ public: TGeneralEdge(Type type) : m_type(type) {} }; -class TEdge : public TGeneralEdge { +class TEdge final : public TGeneralEdge { public: TStroke *m_s; double m_w0, m_w1; diff --git a/toonz/sources/include/tregionprop.h b/toonz/sources/include/tregionprop.h index f1c5d48..bdbd6ea 100644 --- a/toonz/sources/include/tregionprop.h +++ b/toonz/sources/include/tregionprop.h @@ -74,7 +74,7 @@ private: //------------------------------------------------------------------- -class OutlineRegionProp : public TRegionProp { +class OutlineRegionProp final : public TRegionProp { double m_pixelSize; TOutlineStyleP m_colorStyle; diff --git a/toonz/sources/include/trenderresourcemanager.h b/toonz/sources/include/trenderresourcemanager.h index 157a07d..559274a 100644 --- a/toonz/sources/include/trenderresourcemanager.h +++ b/toonz/sources/include/trenderresourcemanager.h @@ -116,7 +116,7 @@ Declares a TRenderResourceManager class, it must be used inside the manager definition. For example: \code -class MyManager : public TRenderResourceManager +class MyManager final : public TRenderResourceManager { T_RENDER_RESOURCE_MANAGER diff --git a/toonz/sources/include/trop.h b/toonz/sources/include/trop.h index 4be07f2..434a7ed 100644 --- a/toonz/sources/include/trop.h +++ b/toonz/sources/include/trop.h @@ -30,7 +30,7 @@ struct _RASTER; // TRopException definition //******************************************************************************** -class DVAPI TRopException : public TException { +class DVAPI TRopException final : public TException { std::string message; public: diff --git a/toonz/sources/include/trop_borders.h b/toonz/sources/include/trop_borders.h index 734f21b..c420473 100644 --- a/toonz/sources/include/trop_borders.h +++ b/toonz/sources/include/trop_borders.h @@ -116,7 +116,7 @@ typedef tcg::Vertex Vertex; //-------------------------------------------------------------------------------- -class Edge : public tcg::Edge { +class Edge final : public tcg::Edge { TPoint m_directions[2]; int m_imageIndex; @@ -133,7 +133,7 @@ public: //-------------------------------------------------------------------------------- -class Face : public tcg::Face { +class Face final : public tcg::Face { tcg::list m_meshes; int m_imageIndex; @@ -153,7 +153,8 @@ public: //-------------------------------------------------------------------------------- -class ImageMesh : public TSmartObject, public tcg::Mesh {}; +class ImageMesh final : public TSmartObject, + public tcg::Mesh {}; //-------------------------------------------------------------------------------- diff --git a/toonz/sources/include/tsimplecolorstyles.h b/toonz/sources/include/tsimplecolorstyles.h index 90358b3..4185a98 100644 --- a/toonz/sources/include/tsimplecolorstyles.h +++ b/toonz/sources/include/tsimplecolorstyles.h @@ -186,7 +186,7 @@ private: Constant thickness stroke style. */ -class DVAPI TCenterLineStrokeStyle : public TSimpleStrokeStyle { +class DVAPI TCenterLineStrokeStyle final : public TSimpleStrokeStyle { TPixel32 m_color; USHORT m_stipple; double m_width; @@ -236,7 +236,7 @@ private: // TRasterImagePatternStrokeStyle declaration //********************************************************************************** -class DVAPI TRasterImagePatternStrokeStyle : public TColorStyle { +class DVAPI TRasterImagePatternStrokeStyle final : public TColorStyle { static TFilePath m_rootDir; protected: @@ -313,7 +313,7 @@ private: // TVectorImagePatternStrokeStyle declaration //********************************************************************************** -class DVAPI TVectorImagePatternStrokeStyle : public TColorStyle { +class DVAPI TVectorImagePatternStrokeStyle final : public TColorStyle { static TFilePath m_rootDir; protected: diff --git a/toonz/sources/include/tsop.h b/toonz/sources/include/tsop.h index 5dc1ddf..5fbfba3 100644 --- a/toonz/sources/include/tsop.h +++ b/toonz/sources/include/tsop.h @@ -17,7 +17,7 @@ //=================================================================== -class DVAPI TSopException : public TException { +class DVAPI TSopException final : public TException { TString m_message; public: diff --git a/toonz/sources/include/tsound.h b/toonz/sources/include/tsound.h index 61d53ac..75593ff 100644 --- a/toonz/sources/include/tsound.h +++ b/toonz/sources/include/tsound.h @@ -245,7 +245,7 @@ Range in seconds //============================================================================== -class TSoundDeviceException : public TException { +class TSoundDeviceException final : public TException { public: enum Type { FailedInit, // fallimento del costruttore diff --git a/toonz/sources/include/tsound_io.h b/toonz/sources/include/tsound_io.h index 6b59da2..5e5b90c 100644 --- a/toonz/sources/include/tsound_io.h +++ b/toonz/sources/include/tsound_io.h @@ -54,7 +54,8 @@ public: template class DVAPI TSmartPointerT; #endif -class DVAPI TSoundTrackReaderP : public TSmartPointerT { +class DVAPI TSoundTrackReaderP final + : public TSmartPointerT { public: TSoundTrackReaderP(const TFilePath &fp); }; @@ -93,7 +94,8 @@ public: template class DVAPI TSmartPointerT; #endif -class DVAPI TSoundTrackWriterP : public TSmartPointerT { +class DVAPI TSoundTrackWriterP final + : public TSmartPointerT { public: TSoundTrackWriterP(const TFilePath &fp); }; diff --git a/toonz/sources/include/tsound_t.h b/toonz/sources/include/tsound_t.h index 81f431e..1735c98 100644 --- a/toonz/sources/include/tsound_t.h +++ b/toonz/sources/include/tsound_t.h @@ -18,7 +18,7 @@ //========================================================= template -class DVAPI TSoundTrackT : public TSoundTrack { +class DVAPI TSoundTrackT final : public TSoundTrack { public: typedef T SampleType; diff --git a/toonz/sources/include/tspectrumparam.h b/toonz/sources/include/tspectrumparam.h index 3a722f2..3cac6df 100644 --- a/toonz/sources/include/tspectrumparam.h +++ b/toonz/sources/include/tspectrumparam.h @@ -35,7 +35,7 @@ template class DVAPI TPersistDeclarationT; //--------------------------------------------------------- -class DVAPI TSpectrumParam : public TParam { +class DVAPI TSpectrumParam final : public TParam { PERSIST_DECLARATION(TSpectrumParam) std::unique_ptr m_imp; @@ -98,7 +98,7 @@ template class DVAPI TSmartPointerT; template class DVAPI TDerivedSmartPointerT; #endif -class DVAPI TSpectrumParamP +class DVAPI TSpectrumParamP final : public TDerivedSmartPointerT { public: TSpectrumParamP() {} diff --git a/toonz/sources/include/tstreamexception.h b/toonz/sources/include/tstreamexception.h index f2db8d2..560bc47 100644 --- a/toonz/sources/include/tstreamexception.h +++ b/toonz/sources/include/tstreamexception.h @@ -22,7 +22,7 @@ class TOStream; //=================================================================== -class DVAPI TIStreamException : public TException { +class DVAPI TIStreamException final : public TException { public: TIStreamException(TIStream &is); TIStreamException(TIStream &is, const TException &e); diff --git a/toonz/sources/include/tstroke.h b/toonz/sources/include/tstroke.h index ca85a26..0cd1e91 100644 --- a/toonz/sources/include/tstroke.h +++ b/toonz/sources/include/tstroke.h @@ -45,7 +45,7 @@ class TFlash; It's possible to use style to set brush, texture, pattern, TStroke now are smart pointer. */ -class DVAPI TStroke : public TSmartObject { +class DVAPI TStroke final : public TSmartObject { DECLARE_CLASS_CODE private: diff --git a/toonz/sources/include/tstrokedeformations.h b/toonz/sources/include/tstrokedeformations.h index 869913b..6ecc301 100644 --- a/toonz/sources/include/tstrokedeformations.h +++ b/toonz/sources/include/tstrokedeformations.h @@ -79,7 +79,7 @@ Max diff of delta (This value indicates when it's necessary const TPointD &vect ... list of parameter. */ -class DVAPI TStrokePointDeformation : public TStrokeDeformation { +class DVAPI TStrokePointDeformation final : public TStrokeDeformation { protected: struct Imp; std::unique_ptr m_imp; @@ -117,7 +117,7 @@ Use this constructor with modifyControlPoints. Function is b*exp( -((x-a)^2)/c ). */ -class DVAPI TStrokeParamDeformation : public TStrokeDeformation { +class DVAPI TStrokeParamDeformation final : public TStrokeDeformation { private: const TStroke *m_pRef; double m_startParameter; @@ -160,7 +160,7 @@ Use this constructor with movePoints. /*! Manage the deformation of thick in a stroke. */ -class DVAPI TStrokeThicknessDeformation : public TStrokeDeformation { +class DVAPI TStrokeThicknessDeformation final : public TStrokeDeformation { private: double m_lengthOfDeformation; double m_startParameter; @@ -203,7 +203,7 @@ Use this constructor with movePoints. /*! Manage the bending of a stroke. */ -class DVAPI TStrokeBenderDeformation : public TStrokeDeformation { +class DVAPI TStrokeBenderDeformation final : public TStrokeDeformation { private: const TStroke *m_pRef; double m_startLength; @@ -250,7 +250,7 @@ Use this constructor with movePoints. /*! Manage wirling of a stroke. */ -class DVAPI TStrokeTwirlDeformation : public TStrokeDeformation { +class DVAPI TStrokeTwirlDeformation final : public TStrokeDeformation { private: TPointD m_center; double m_innerRadius2; diff --git a/toonz/sources/include/tstrokeprop.h b/toonz/sources/include/tstrokeprop.h index 44be93d..9780056 100644 --- a/toonz/sources/include/tstrokeprop.h +++ b/toonz/sources/include/tstrokeprop.h @@ -31,7 +31,7 @@ class TCenterLineStrokeStyle; //============================================================================= -class DVAPI TSimpleStrokeProp : public TStrokeProp { +class DVAPI TSimpleStrokeProp final : public TStrokeProp { protected: TSimpleStrokeStyle *m_colorStyle; @@ -48,7 +48,7 @@ public: //============================================================================= -class DVAPI TRasterImagePatternStrokeProp : public TStrokeProp { +class DVAPI TRasterImagePatternStrokeProp final : public TStrokeProp { protected: TRasterImagePatternStrokeStyle *m_colorStyle; std::vector m_transformations; @@ -67,7 +67,7 @@ public: //============================================================================= -class DVAPI TVectorImagePatternStrokeProp : public TStrokeProp { +class DVAPI TVectorImagePatternStrokeProp final : public TStrokeProp { protected: TVectorImagePatternStrokeStyle *m_colorStyle; std::vector m_transformations; @@ -86,7 +86,7 @@ public: //============================================================================= -class DVAPI OutlineStrokeProp : public TStrokeProp { +class DVAPI OutlineStrokeProp final : public TStrokeProp { protected: TOutlineStyleP m_colorStyle; TStrokeOutline m_outline; diff --git a/toonz/sources/include/tsystem.h b/toonz/sources/include/tsystem.h index f6f0a56..1c2e8ca 100644 --- a/toonz/sources/include/tsystem.h +++ b/toonz/sources/include/tsystem.h @@ -62,7 +62,7 @@ public: #endif -class DVAPI TSystemException : public TException { +class DVAPI TSystemException final : public TException { TFilePath m_fname; int m_err; TString m_msg; diff --git a/toonz/sources/include/ttessellator.h b/toonz/sources/include/ttessellator.h index 1c74f34..f6f794e 100644 --- a/toonz/sources/include/ttessellator.h +++ b/toonz/sources/include/ttessellator.h @@ -41,7 +41,7 @@ public: //=========================================== //============================================================================= -class DVAPI TglTessellator : public TTessellator { +class DVAPI TglTessellator final : public TTessellator { public: // TThread::Mutex m_mutex; diff --git a/toonz/sources/include/tthreadmessage.h b/toonz/sources/include/tthreadmessage.h index 0eea6f0..67e1123 100644 --- a/toonz/sources/include/tthreadmessage.h +++ b/toonz/sources/include/tthreadmessage.h @@ -82,7 +82,7 @@ public: #else -class DVAPI Mutex : public QMutex { +class DVAPI Mutex final : public QMutex { public: Mutex() : QMutex(QMutex::Recursive) {} diff --git a/toonz/sources/include/ttimer.h b/toonz/sources/include/ttimer.h index a208ae1..c448926 100644 --- a/toonz/sources/include/ttimer.h +++ b/toonz/sources/include/ttimer.h @@ -28,7 +28,7 @@ public: //------------------------------------------------------------------- template -class TTimerAction : public TGenericTimerAction { +class TTimerAction final : public TGenericTimerAction { public: typedef void (T::*Method)(TUINT64 tick); TTimerAction(T *target, Method method) : m_target(target), m_method(method) {} diff --git a/toonz/sources/include/ttonecurveparam.h b/toonz/sources/include/ttonecurveparam.h index d4aecbf..94063be 100644 --- a/toonz/sources/include/ttonecurveparam.h +++ b/toonz/sources/include/ttonecurveparam.h @@ -26,7 +26,7 @@ //--------------------------------------------------------- -class DVAPI TToneCurveParam : public TParam { +class DVAPI TToneCurveParam final : public TParam { PERSIST_DECLARATION(TToneCurveParam) TParamSetP m_rgbaParamSet; @@ -96,7 +96,7 @@ template class DVAPI TSmartPointerT; template class DVAPI TDerivedSmartPointerT; #endif -class DVAPI TToneCurveParamP +class DVAPI TToneCurveParamP final : public TDerivedSmartPointerT { public: TToneCurveParamP() {} diff --git a/toonz/sources/include/ttoonzimage.h b/toonz/sources/include/ttoonzimage.h index d8739e1..bc1e983 100644 --- a/toonz/sources/include/ttoonzimage.h +++ b/toonz/sources/include/ttoonzimage.h @@ -20,7 +20,7 @@ class TToonzImageP; //! An image containing a Toonz raster. -class DVAPI TToonzImage : public TImage { +class DVAPI TToonzImage final : public TImage { //! dpi value for x axis double m_dpix, //! dpi value for y axis @@ -122,7 +122,8 @@ template class DVAPI TSmartPointerT; template class DVAPI TDerivedSmartPointerT; #endif -class DVAPI TToonzImageP : public TDerivedSmartPointerT { +class DVAPI TToonzImageP final + : public TDerivedSmartPointerT { public: TToonzImageP() {} TToonzImageP(TToonzImage *image) : DerivedSmartPointer(image) {} diff --git a/toonz/sources/include/ttzpimagefx.h b/toonz/sources/include/ttzpimagefx.h index 321046c..76b87b2 100644 --- a/toonz/sources/include/ttzpimagefx.h +++ b/toonz/sources/include/ttzpimagefx.h @@ -32,7 +32,7 @@ // ExternalPaletteFxRenderData declaration //********************************************************************************************** -class DVAPI ExternalPaletteFxRenderData : public TRasterFxRenderData { +class DVAPI ExternalPaletteFxRenderData final : public TRasterFxRenderData { public: TPaletteP m_palette; std::string m_name; @@ -61,7 +61,7 @@ enum FilterType { //------------------------------------------------------------------------------ -class DVAPI PaletteFilterFxRenderData : public TRasterFxRenderData { +class DVAPI PaletteFilterFxRenderData final : public TRasterFxRenderData { public: bool m_keep; FilterType m_type; @@ -171,7 +171,7 @@ public: // SandorFxRenderData declaration //********************************************************************************************** -class DVAPI SandorFxRenderData : public TRasterFxRenderData { +class DVAPI SandorFxRenderData final : public TRasterFxRenderData { public: Type m_type; BlendTzParams m_blendParams; diff --git a/toonz/sources/include/tundo.h b/toonz/sources/include/tundo.h index 0dec250..64a9800 100644 --- a/toonz/sources/include/tundo.h +++ b/toonz/sources/include/tundo.h @@ -57,7 +57,7 @@ private: // TUndoManager class //************************************************************************ -class DVAPI TUndoManager : public QObject { +class DVAPI TUndoManager final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/include/tunit.h b/toonz/sources/include/tunit.h index be80d5e..944c689 100644 --- a/toonz/sources/include/tunit.h +++ b/toonz/sources/include/tunit.h @@ -32,7 +32,7 @@ public: //--------------------------- -class DVAPI TSimpleUnitConverter : public TUnitConverter { +class DVAPI TSimpleUnitConverter final : public TUnitConverter { const double m_factor, m_offset; public: diff --git a/toonz/sources/include/tvectorbrushstyle.h b/toonz/sources/include/tvectorbrushstyle.h index fb15430..e6664f6 100644 --- a/toonz/sources/include/tvectorbrushstyle.h +++ b/toonz/sources/include/tvectorbrushstyle.h @@ -22,7 +22,7 @@ // Vector Brush Style declaration //********************************************************************** -class DVAPI TVectorBrushStyle : public TColorStyle { +class DVAPI TVectorBrushStyle final : public TColorStyle { static TFilePath m_rootDir; std::string m_brushName; diff --git a/toonz/sources/include/tvectorimage.h b/toonz/sources/include/tvectorimage.h index 1e9ee8e..807874a 100644 --- a/toonz/sources/include/tvectorimage.h +++ b/toonz/sources/include/tvectorimage.h @@ -55,7 +55,7 @@ class VIStroke; A vector image is a set of strokes and regions. \relates TImage */ -class DVAPI TVectorImage : public TImage { +class DVAPI TVectorImage final : public TImage { class Imp; int pickGroup(const TPointD &pos, bool onEnteredGroup) const; @@ -413,7 +413,8 @@ template class DVAPI TSmartPointerT; template class DVAPI TDerivedSmartPointerT; #endif -class DVAPI TVectorImageP : public TDerivedSmartPointerT { +class DVAPI TVectorImageP final + : public TDerivedSmartPointerT { public: TVectorImageP() {} TVectorImageP(TVectorImage *image) : DerivedSmartPointer(image) {} diff --git a/toonz/sources/sound/aiff/tsio_aiff.cpp b/toonz/sources/sound/aiff/tsio_aiff.cpp index 70c3f80..7122a9c 100644 --- a/toonz/sources/sound/aiff/tsio_aiff.cpp +++ b/toonz/sources/sound/aiff/tsio_aiff.cpp @@ -70,7 +70,7 @@ public: // COMM Chunk: Chunk contenente le informazioni sulla traccia -class TCOMMChunk : public TAIFFChunk { +class TCOMMChunk final : public TAIFFChunk { public: USHORT m_chans; // numero di canali TUINT32 m_frames; // numero di campioni @@ -145,7 +145,7 @@ ostream &operator<<(ostream &os, const TCOMMChunk &commChunk) { // SSND Chunk: Chunk contenente i campioni della traccia -class TSSNDChunk : public TAIFFChunk { +class TSSNDChunk final : public TAIFFChunk { public: TUINT32 m_offset; // dall'inizio dei sample frames tra i wavedata TUINT32 m_blockSize; diff --git a/toonz/sources/sound/aiff/tsio_aiff.h b/toonz/sources/sound/aiff/tsio_aiff.h index d63caea..119b8bc 100644 --- a/toonz/sources/sound/aiff/tsio_aiff.h +++ b/toonz/sources/sound/aiff/tsio_aiff.h @@ -11,7 +11,7 @@ The class TSoundTrackReaderAiff reads audio files having .aiff extension */ -class TSoundTrackReaderAiff : public TSoundTrackReader { +class TSoundTrackReaderAiff final : public TSoundTrackReader { public: TSoundTrackReaderAiff(const TFilePath &fp); ~TSoundTrackReaderAiff() {} @@ -35,7 +35,7 @@ Returns a soundtrack reader able to read .aiff audio files The class TSoundTrackWriterAiff writes audio file having .aiff extension */ -class TSoundTrackWriterAiff : public TSoundTrackWriter { +class TSoundTrackWriterAiff final : public TSoundTrackWriter { public: TSoundTrackWriterAiff(const TFilePath &fp); ~TSoundTrackWriterAiff() {} diff --git a/toonz/sources/sound/raw/tsio_raw.h b/toonz/sources/sound/raw/tsio_raw.h index a08d293..a5a36ae 100644 --- a/toonz/sources/sound/raw/tsio_raw.h +++ b/toonz/sources/sound/raw/tsio_raw.h @@ -11,7 +11,7 @@ The class TSoundTrackReaderRaw reads audio files having .raw extension (this kind of file contains only the sample) */ -class TSoundTrackReaderRaw : public TSoundTrackReader { +class TSoundTrackReaderRaw final : public TSoundTrackReader { public: TSoundTrackReaderRaw(const TFilePath &fp); ~TSoundTrackReaderRaw() {} @@ -36,7 +36,7 @@ Returns a soundtrack reader able to read .raw audio files The class TSoundTrackWriterRaw writes audio file having .raw extension (this kind of file contains only the sample) */ -class TSoundTrackWriterRaw : public TSoundTrackWriter { +class TSoundTrackWriterRaw final : public TSoundTrackWriter { public: TSoundTrackWriterRaw(const TFilePath &fp); ~TSoundTrackWriterRaw() {} diff --git a/toonz/sources/sound/wav/tsio_wav.cpp b/toonz/sources/sound/wav/tsio_wav.cpp index 005b5fe..5521b83 100644 --- a/toonz/sources/sound/wav/tsio_wav.cpp +++ b/toonz/sources/sound/wav/tsio_wav.cpp @@ -66,7 +66,7 @@ TINT32 TWAVChunk::HDR_LENGTH = 8; // FMT Chunk: Chunk contenente le informazioni sulla traccia -class TFMTChunk : public TWAVChunk { +class TFMTChunk final : public TWAVChunk { public: static TINT32 LENGTH; @@ -139,7 +139,7 @@ TINT32 TFMTChunk::LENGTH = TWAVChunk::HDR_LENGTH + 16; // DATA Chunk: Chunk contenente i campioni -class TDATAChunk : public TWAVChunk { +class TDATAChunk final : public TWAVChunk { public: std::unique_ptr m_samples; diff --git a/toonz/sources/sound/wav/tsio_wav.h b/toonz/sources/sound/wav/tsio_wav.h index 6b7a55b..207a489 100644 --- a/toonz/sources/sound/wav/tsio_wav.h +++ b/toonz/sources/sound/wav/tsio_wav.h @@ -10,7 +10,7 @@ The class TSoundTrackReaderWav reads audio files having .wav extension */ -class TSoundTrackReaderWav : public TSoundTrackReader { +class TSoundTrackReaderWav final : public TSoundTrackReader { public: TSoundTrackReaderWav(const TFilePath &fp); ~TSoundTrackReaderWav() {} @@ -35,7 +35,7 @@ The class TSoundTrackWriterWav writes audio file having .wav extension */ -class TSoundTrackWriterWav : public TSoundTrackWriter { +class TSoundTrackWriterWav final : public TSoundTrackWriter { public: TSoundTrackWriterWav(const TFilePath &fp); ~TSoundTrackWriterWav() {} diff --git a/toonz/sources/stdfx/adjustlevelsfx.cpp b/toonz/sources/stdfx/adjustlevelsfx.cpp index ec90e2b..2f043c8 100644 --- a/toonz/sources/stdfx/adjustlevelsfx.cpp +++ b/toonz/sources/stdfx/adjustlevelsfx.cpp @@ -9,7 +9,7 @@ //=================================================================== -class AdjustLevelsFx : public TStandardRasterFx { +class AdjustLevelsFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(AdjustLevelsFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/artcontourfx.cpp b/toonz/sources/stdfx/artcontourfx.cpp index 4837fc2..d19f2f5 100644 --- a/toonz/sources/stdfx/artcontourfx.cpp +++ b/toonz/sources/stdfx/artcontourfx.cpp @@ -9,7 +9,7 @@ #include "trasterfx.h" #include "tspectrumparam.h" -class ArtContourFx : public TStandardRasterFx { +class ArtContourFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ArtContourFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/backlitfx.cpp b/toonz/sources/stdfx/backlitfx.cpp index ea85c7c..0d15575 100644 --- a/toonz/sources/stdfx/backlitfx.cpp +++ b/toonz/sources/stdfx/backlitfx.cpp @@ -176,7 +176,7 @@ void backlit(TRaster64P lighted, TRaster64P light, TRaster64P out, double blur, //--------------------------------------------------------------------- -class BacklitFx : public TBaseRasterFx { +class BacklitFx final : public TBaseRasterFx { FX_DECLARATION(BacklitFx) TRasterFxPort m_lighted, m_light; TDoubleParamP m_value; diff --git a/toonz/sources/stdfx/blendtzfx.cpp b/toonz/sources/stdfx/blendtzfx.cpp index 53d1623..7160759 100644 --- a/toonz/sources/stdfx/blendtzfx.cpp +++ b/toonz/sources/stdfx/blendtzfx.cpp @@ -9,7 +9,7 @@ #include "trasterfx.h" //----------------------------------------------------------------------------------------- -class BlendTzFx : public TStandardRasterFx { +class BlendTzFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(BlendTzFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/blurfx.cpp b/toonz/sources/stdfx/blurfx.cpp index 2dfd499..dde4f3e 100644 --- a/toonz/sources/stdfx/blurfx.cpp +++ b/toonz/sources/stdfx/blurfx.cpp @@ -6,7 +6,7 @@ //------------------------------------------------------------------- -class BlurFx : public TStandardRasterFx { +class BlurFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(BlurFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/bodyhighlightfx.cpp b/toonz/sources/stdfx/bodyhighlightfx.cpp index c779a14..aedcc73 100644 --- a/toonz/sources/stdfx/bodyhighlightfx.cpp +++ b/toonz/sources/stdfx/bodyhighlightfx.cpp @@ -331,7 +331,7 @@ void doBodyHighlight(const TRasterPT rout, const TRasterPT rin, // BodyHighLightFx implementation //************************************************************************ -class BodyHighLightFx : public TStandardRasterFx { +class BodyHighLightFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(BodyHighLightFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/bright_contfx.cpp b/toonz/sources/stdfx/bright_contfx.cpp index 0e12fd3..c69a60d 100644 --- a/toonz/sources/stdfx/bright_contfx.cpp +++ b/toonz/sources/stdfx/bright_contfx.cpp @@ -4,7 +4,7 @@ #include "tfxparam.h" #include "tpixelutils.h" -class Bright_ContFx : public TStandardRasterFx { +class Bright_ContFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(Bright_ContFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/calligraphicfx.cpp b/toonz/sources/stdfx/calligraphicfx.cpp index d4f0334..f1e4113 100644 --- a/toonz/sources/stdfx/calligraphicfx.cpp +++ b/toonz/sources/stdfx/calligraphicfx.cpp @@ -22,7 +22,7 @@ //=================================================================== -class CalligraphicFx : public TStandardRasterFx { +class CalligraphicFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(CalligraphicFx) TRasterFxPort m_input; TStringParamP m_colorIndex; @@ -189,7 +189,7 @@ private: //------------------------------------------------------------------ //=================================================================== -class OutBorderFx : public TStandardRasterFx { +class OutBorderFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(OutBorderFx) TRasterFxPort m_input; TDoubleParamP m_thickness; diff --git a/toonz/sources/stdfx/changecolorfx.cpp b/toonz/sources/stdfx/changecolorfx.cpp index 1e61bde..c354f62 100644 --- a/toonz/sources/stdfx/changecolorfx.cpp +++ b/toonz/sources/stdfx/changecolorfx.cpp @@ -99,7 +99,7 @@ static void OLDHSV2RGB(double hue, double sat, double value, double *red, } } -class ChangeColorFx : public TStandardRasterFx { +class ChangeColorFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ChangeColorFx) TRasterFxPort m_input; TPixelParamP m_from_color; diff --git a/toonz/sources/stdfx/channelmixerfx.cpp b/toonz/sources/stdfx/channelmixerfx.cpp index 16f880a..89d4040 100644 --- a/toonz/sources/stdfx/channelmixerfx.cpp +++ b/toonz/sources/stdfx/channelmixerfx.cpp @@ -8,7 +8,7 @@ //================================================================== -class ChannelMixerFx : public TStandardRasterFx { +class ChannelMixerFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ChannelMixerFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/cloudsfx.cpp b/toonz/sources/stdfx/cloudsfx.cpp index e34af48..3196622 100644 --- a/toonz/sources/stdfx/cloudsfx.cpp +++ b/toonz/sources/stdfx/cloudsfx.cpp @@ -6,7 +6,7 @@ #include "stdfx.h" #include "tspectrumparam.h" -class CloudsFx : public TStandardZeraryFx { +class CloudsFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(CloudsFx) TIntEnumParamP m_type; TDoubleParamP m_size; diff --git a/toonz/sources/stdfx/colorembossfx.cpp b/toonz/sources/stdfx/colorembossfx.cpp index 01c3fb9..248d560 100644 --- a/toonz/sources/stdfx/colorembossfx.cpp +++ b/toonz/sources/stdfx/colorembossfx.cpp @@ -6,7 +6,7 @@ //=================================================================== -class ColorEmbossFx : public TStandardRasterFx { +class ColorEmbossFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ColorEmbossFx) TRasterFxPort m_input; @@ -34,7 +34,8 @@ public: ~ColorEmbossFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { + bool doGetBBox(double frame, TRectD &bBox, + const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; diff --git a/toonz/sources/stdfx/cornerpinfx.cpp b/toonz/sources/stdfx/cornerpinfx.cpp index 354d92e..c3a48c3 100644 --- a/toonz/sources/stdfx/cornerpinfx.cpp +++ b/toonz/sources/stdfx/cornerpinfx.cpp @@ -18,7 +18,7 @@ inline bool myIsEmpty(const TRectD &r) { return r.x0 >= r.x1 || r.y0 >= r.y1; } //============================================================================== -class CornerPinFx : public TStandardRasterFx { +class CornerPinFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(CornerPinFx) enum { PERSPECTIVE, BILINEAR }; diff --git a/toonz/sources/stdfx/despecklefx.cpp b/toonz/sources/stdfx/despecklefx.cpp index dee3772..dcbde31 100644 --- a/toonz/sources/stdfx/despecklefx.cpp +++ b/toonz/sources/stdfx/despecklefx.cpp @@ -11,7 +11,7 @@ //-------------------------------------------------------------------------- -class DespeckleFx : public TStandardRasterFx { +class DespeckleFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(DespeckleFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/diamondgradientfx.cpp b/toonz/sources/stdfx/diamondgradientfx.cpp index dd40637..03d544c 100644 --- a/toonz/sources/stdfx/diamondgradientfx.cpp +++ b/toonz/sources/stdfx/diamondgradientfx.cpp @@ -6,7 +6,7 @@ #include "tspectrumparam.h" #include "tparamuiconcept.h" -class DiamondGradientFx : public TStandardZeraryFx { +class DiamondGradientFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(DiamondGradientFx) TSpectrumParamP m_colors; TDoubleParamP m_size; diff --git a/toonz/sources/stdfx/dissolvefx.cpp b/toonz/sources/stdfx/dissolvefx.cpp index e98ed67..9d6716e 100644 --- a/toonz/sources/stdfx/dissolvefx.cpp +++ b/toonz/sources/stdfx/dissolvefx.cpp @@ -8,7 +8,7 @@ //=================================================================== -class DissolveFx : public TStandardRasterFx { +class DissolveFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(DissolveFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/embossfx.cpp b/toonz/sources/stdfx/embossfx.cpp index e7329e5..737c16c 100644 --- a/toonz/sources/stdfx/embossfx.cpp +++ b/toonz/sources/stdfx/embossfx.cpp @@ -5,7 +5,7 @@ #include "tpixelutils.h" //=================================================================== -class EmbossFx : public TStandardRasterFx { +class EmbossFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(EmbossFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/erodilatefx.cpp b/toonz/sources/stdfx/erodilatefx.cpp index c4025ae..5a68d88 100644 --- a/toonz/sources/stdfx/erodilatefx.cpp +++ b/toonz/sources/stdfx/erodilatefx.cpp @@ -14,7 +14,7 @@ // ErodeDilate Fx //**************************************************************************** -class ErodeDilateFx : public TStandardRasterFx { +class ErodeDilateFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ErodeDilateFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/externalpalettefx.cpp b/toonz/sources/stdfx/externalpalettefx.cpp index 28dd2b9..296a3cd 100644 --- a/toonz/sources/stdfx/externalpalettefx.cpp +++ b/toonz/sources/stdfx/externalpalettefx.cpp @@ -11,7 +11,7 @@ //=================================================================== -class ExternalPaletteFx : public TStandardRasterFx { +class ExternalPaletteFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ExternalPaletteFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/fourpointsgradientfx.cpp b/toonz/sources/stdfx/fourpointsgradientfx.cpp index 374bf59..0ae3a04 100644 --- a/toonz/sources/stdfx/fourpointsgradientfx.cpp +++ b/toonz/sources/stdfx/fourpointsgradientfx.cpp @@ -13,7 +13,7 @@ inline void pixelConvert(TPixel64 &dst, const TPixel32 &src) { } } // namespace -class FourPointsGradientFx : public TStandardZeraryFx { +class FourPointsGradientFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(FourPointsGradientFx) TSpectrumParamP m_colors; TPointParamP m_point1; diff --git a/toonz/sources/stdfx/freedistortfx.cpp b/toonz/sources/stdfx/freedistortfx.cpp index ef5272d..6f17afa 100644 --- a/toonz/sources/stdfx/freedistortfx.cpp +++ b/toonz/sources/stdfx/freedistortfx.cpp @@ -75,14 +75,14 @@ private: TDoubleParamP m_downBlur; }; -class FreeDistortFx : public FreeDistortBaseFx { +class FreeDistortFx final : public FreeDistortBaseFx { FX_PLUGIN_DECLARATION(FreeDistortFx) public: FreeDistortFx() : FreeDistortBaseFx(false) {} }; -class CastShadowFx : public FreeDistortBaseFx { +class CastShadowFx final : public FreeDistortBaseFx { FX_PLUGIN_DECLARATION(CastShadowFx) public: CastShadowFx() : FreeDistortBaseFx(true) {} diff --git a/toonz/sources/stdfx/gammafx.cpp b/toonz/sources/stdfx/gammafx.cpp index 29b2820..4849130 100644 --- a/toonz/sources/stdfx/gammafx.cpp +++ b/toonz/sources/stdfx/gammafx.cpp @@ -4,7 +4,7 @@ #include "tfxparam.h" #include "trop.h" -class GammaFx : public TStandardRasterFx { +class GammaFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(GammaFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/glowfx.cpp b/toonz/sources/stdfx/glowfx.cpp index ef59397..207c4b1 100644 --- a/toonz/sources/stdfx/glowfx.cpp +++ b/toonz/sources/stdfx/glowfx.cpp @@ -110,7 +110,7 @@ void fade(TRasterPT ras, double fade, T color) // Why it is not in TRop..?? // Glow Fx //----------------- -class GlowFx : public TBaseRasterFx { +class GlowFx final : public TBaseRasterFx { FX_DECLARATION(GlowFx) TRasterFxPort m_lighted, m_light; diff --git a/toonz/sources/stdfx/hsvkeyfx.cpp b/toonz/sources/stdfx/hsvkeyfx.cpp index cf5d0d0..760440d 100644 --- a/toonz/sources/stdfx/hsvkeyfx.cpp +++ b/toonz/sources/stdfx/hsvkeyfx.cpp @@ -6,7 +6,7 @@ #include "stdfx.h" #include "hsvutil.h" -class HSVKeyFx : public TStandardRasterFx { +class HSVKeyFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(HSVKeyFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/hsvscalefx.cpp b/toonz/sources/stdfx/hsvscalefx.cpp index b78e09f..42cd16f 100644 --- a/toonz/sources/stdfx/hsvscalefx.cpp +++ b/toonz/sources/stdfx/hsvscalefx.cpp @@ -6,7 +6,7 @@ #include "stdfx.h" #include "hsvutil.h" -class HSVScaleFx : public TStandardRasterFx { +class HSVScaleFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(HSVScaleFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/igs_fog.cpp b/toonz/sources/stdfx/igs_fog.cpp index 482fbc3..e5586cd 100644 --- a/toonz/sources/stdfx/igs_fog.cpp +++ b/toonz/sources/stdfx/igs_fog.cpp @@ -566,9 +566,9 @@ void put_sl_ch_(std::vector &result, const int hh, const int ww, } namespace { //-------------------------------------------------------- template -class one_thread_ +class one_thread_ final : public igs::resource::thread_execute_interface { /* thread単位の実行設定 - */ + */ public: one_thread_() {} void setup(T in_image, T out_image, double *ref_thresh diff --git a/toonz/sources/stdfx/igs_line_blur.cpp b/toonz/sources/stdfx/igs_line_blur.cpp index 00b9d4f..9be8816 100644 --- a/toonz/sources/stdfx/igs_line_blur.cpp +++ b/toonz/sources/stdfx/igs_line_blur.cpp @@ -1159,7 +1159,7 @@ typedef unsigned short uint16_t; #endif /* x,yポイント座標のリストノード、画素連結、及び、線分連結、機能付き */ -class pixel_point_node : public list_node { +class pixel_point_node final : public list_node { public: pixel_point_node() { int32_t ii; @@ -1285,7 +1285,7 @@ void pixel_point_node::print_xy_around(void) { #define OFF (0) #endif -class pixel_point_root : public list_root { +class pixel_point_root final : public list_root { public: pixel_point_root(void) { this->_i_mv_sw = OFF; @@ -1456,7 +1456,7 @@ int pixel_point_root::save(const char *cp_fname) { #define NG (-1) #endif -class pixel_line_node : public list_node { +class pixel_line_node final : public list_node { public: pixel_line_node() { this->_i32_point_count = 0; @@ -2397,7 +2397,7 @@ void pixel_line_node::smooth_expand(int32_t i32_smooth_retry) { #include "igs_line_blur.h" // "list_root.h" "calculator_geometry.h" "pixel_point_root.h" "pixel_line_root.h" -class pixel_select_same_way_node : public list_node { +class pixel_select_same_way_node final : public list_node { public: pixel_select_same_way_node(void) { this->clp_point_middle = NULL; @@ -2419,7 +2419,7 @@ public: private: }; -class pixel_select_same_way_root : public list_root { +class pixel_select_same_way_root final : public list_root { public: pixel_select_same_way_root(void) { this->_i_mv_sw = OFF; @@ -2715,7 +2715,7 @@ void pixel_select_same_way_root::get_vector(double *dp_xv, double *dp_yv) { #include "igs_line_blur.h" // "list_root.h" "calculator_geometry.h" "pixel_point_root.h" "pixel_line_node.h" "pixel_select_same_way.h" -class pixel_line_root : public list_root { +class pixel_line_root final : public list_root { public: pixel_line_root(void) { this->_i_mv_sw = OFF; @@ -3925,7 +3925,7 @@ int pixel_line_root::save_expand_vector(const char *cp_fname) { #include "igs_line_blur.h" // "list_root.h" "calculator_geometry.h" "pixel_point_root.h" "pixel_line_root.h" -class pixel_select_curve_blur_node : public list_node { +class pixel_select_curve_blur_node final : public list_node { public: pixel_select_curve_blur_node(void) { this->clp_line = NULL; @@ -3953,7 +3953,7 @@ public: private: }; -class pixel_select_curve_blur_root : public list_root { +class pixel_select_curve_blur_root final : public list_root { public: pixel_select_curve_blur_root(void) { this->_i_mv_sw = OFF; diff --git a/toonz/sources/stdfx/igs_maxmin_multithread.h b/toonz/sources/stdfx/igs_maxmin_multithread.h index 98fd34d..6404949 100644 --- a/toonz/sources/stdfx/igs_maxmin_multithread.h +++ b/toonz/sources/stdfx/igs_maxmin_multithread.h @@ -10,9 +10,9 @@ namespace igs { namespace maxmin { template -class thread +class thread final : public igs::resource::thread_execute_interface { /* thread単位の実行設定 - */ + */ public: thread() {} void setup( diff --git a/toonz/sources/stdfx/ino_blend_add.cpp b/toonz/sources/stdfx/ino_blend_add.cpp index 00f134d..d03c268 100644 --- a/toonz/sources/stdfx/ino_blend_add.cpp +++ b/toonz/sources/stdfx/ino_blend_add.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_add : public TBlendForeBackRasterFx { +class ino_blend_add final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_add) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_color_burn.cpp b/toonz/sources/stdfx/ino_blend_color_burn.cpp index cda5c95..2c18627 100644 --- a/toonz/sources/stdfx/ino_blend_color_burn.cpp +++ b/toonz/sources/stdfx/ino_blend_color_burn.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_color_burn : public TBlendForeBackRasterFx { +class ino_blend_color_burn final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_color_burn) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_color_dodge.cpp b/toonz/sources/stdfx/ino_blend_color_dodge.cpp index 92c3dc7..ddda38e 100644 --- a/toonz/sources/stdfx/ino_blend_color_dodge.cpp +++ b/toonz/sources/stdfx/ino_blend_color_dodge.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_color_dodge : public TBlendForeBackRasterFx { +class ino_blend_color_dodge final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_color_dodge) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp b/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp index 06c6bff..9c774f6 100644 --- a/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp +++ b/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_cross_dissolve : public TBlendForeBackRasterFx { +class ino_blend_cross_dissolve final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_cross_dissolve) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_darken.cpp b/toonz/sources/stdfx/ino_blend_darken.cpp index 20173d6..bbfc76f 100644 --- a/toonz/sources/stdfx/ino_blend_darken.cpp +++ b/toonz/sources/stdfx/ino_blend_darken.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_darken : public TBlendForeBackRasterFx { +class ino_blend_darken final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_darken) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_darker_color.cpp b/toonz/sources/stdfx/ino_blend_darker_color.cpp index ac7b7bc..658a94d 100644 --- a/toonz/sources/stdfx/ino_blend_darker_color.cpp +++ b/toonz/sources/stdfx/ino_blend_darker_color.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_darker_color : public TBlendForeBackRasterFx { +class ino_blend_darker_color final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_darker_color) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_divide.cpp b/toonz/sources/stdfx/ino_blend_divide.cpp index 4bc0aae..42cd07a 100644 --- a/toonz/sources/stdfx/ino_blend_divide.cpp +++ b/toonz/sources/stdfx/ino_blend_divide.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_divide : public TBlendForeBackRasterFx { +class ino_blend_divide final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_divide) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_hard_light.cpp b/toonz/sources/stdfx/ino_blend_hard_light.cpp index 209cb21..bc40569 100644 --- a/toonz/sources/stdfx/ino_blend_hard_light.cpp +++ b/toonz/sources/stdfx/ino_blend_hard_light.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_hard_light : public TBlendForeBackRasterFx { +class ino_blend_hard_light final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_hard_light) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_hard_mix.cpp b/toonz/sources/stdfx/ino_blend_hard_mix.cpp index 5909c69..bc2b5cb 100644 --- a/toonz/sources/stdfx/ino_blend_hard_mix.cpp +++ b/toonz/sources/stdfx/ino_blend_hard_mix.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_hard_mix : public TBlendForeBackRasterFx { +class ino_blend_hard_mix final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_hard_mix) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_lighten.cpp b/toonz/sources/stdfx/ino_blend_lighten.cpp index 202a6c9..5bb8bb9 100644 --- a/toonz/sources/stdfx/ino_blend_lighten.cpp +++ b/toonz/sources/stdfx/ino_blend_lighten.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_lighten : public TBlendForeBackRasterFx { +class ino_blend_lighten final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_lighten) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_lighter_color.cpp b/toonz/sources/stdfx/ino_blend_lighter_color.cpp index 7d8ecdf..b8d081e 100644 --- a/toonz/sources/stdfx/ino_blend_lighter_color.cpp +++ b/toonz/sources/stdfx/ino_blend_lighter_color.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_lighter_color : public TBlendForeBackRasterFx { +class ino_blend_lighter_color final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_lighter_color) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_linear_burn.cpp b/toonz/sources/stdfx/ino_blend_linear_burn.cpp index 0ba5e86..d1e63ec 100644 --- a/toonz/sources/stdfx/ino_blend_linear_burn.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_burn.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_linear_burn : public TBlendForeBackRasterFx { +class ino_blend_linear_burn final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_linear_burn) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_linear_dodge.cpp b/toonz/sources/stdfx/ino_blend_linear_dodge.cpp index 1fef84c..9e8598a 100644 --- a/toonz/sources/stdfx/ino_blend_linear_dodge.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_dodge.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_linear_dodge : public TBlendForeBackRasterFx { +class ino_blend_linear_dodge final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_linear_dodge) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_linear_light.cpp b/toonz/sources/stdfx/ino_blend_linear_light.cpp index d5fb8fe..3f7439c 100644 --- a/toonz/sources/stdfx/ino_blend_linear_light.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_light.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_linear_light : public TBlendForeBackRasterFx { +class ino_blend_linear_light final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_linear_light) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_multiply.cpp b/toonz/sources/stdfx/ino_blend_multiply.cpp index 91c6e20..88676ed 100644 --- a/toonz/sources/stdfx/ino_blend_multiply.cpp +++ b/toonz/sources/stdfx/ino_blend_multiply.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_multiply : public TBlendForeBackRasterFx { +class ino_blend_multiply final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_multiply) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_over.cpp b/toonz/sources/stdfx/ino_blend_over.cpp index 63f1c9e..84d36ff 100644 --- a/toonz/sources/stdfx/ino_blend_over.cpp +++ b/toonz/sources/stdfx/ino_blend_over.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_over : public TBlendForeBackRasterFx { +class ino_blend_over final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_over) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_overlay.cpp b/toonz/sources/stdfx/ino_blend_overlay.cpp index 0dbfc20..b695d16 100644 --- a/toonz/sources/stdfx/ino_blend_overlay.cpp +++ b/toonz/sources/stdfx/ino_blend_overlay.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_overlay : public TBlendForeBackRasterFx { +class ino_blend_overlay final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_overlay) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_pin_light.cpp b/toonz/sources/stdfx/ino_blend_pin_light.cpp index 01e7db6..a63de63 100644 --- a/toonz/sources/stdfx/ino_blend_pin_light.cpp +++ b/toonz/sources/stdfx/ino_blend_pin_light.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_pin_light : public TBlendForeBackRasterFx { +class ino_blend_pin_light final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_pin_light) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_screen.cpp b/toonz/sources/stdfx/ino_blend_screen.cpp index 84b002e..c888480 100644 --- a/toonz/sources/stdfx/ino_blend_screen.cpp +++ b/toonz/sources/stdfx/ino_blend_screen.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_screen : public TBlendForeBackRasterFx { +class ino_blend_screen final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_screen) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_soft_light.cpp b/toonz/sources/stdfx/ino_blend_soft_light.cpp index 01f2edc..def90f9 100644 --- a/toonz/sources/stdfx/ino_blend_soft_light.cpp +++ b/toonz/sources/stdfx/ino_blend_soft_light.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_soft_light : public TBlendForeBackRasterFx { +class ino_blend_soft_light final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_soft_light) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_subtract.cpp b/toonz/sources/stdfx/ino_blend_subtract.cpp index f6674bc..b2dfee9 100644 --- a/toonz/sources/stdfx/ino_blend_subtract.cpp +++ b/toonz/sources/stdfx/ino_blend_subtract.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_subtract : public TBlendForeBackRasterFx { +class ino_blend_subtract final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_subtract) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blend_vivid_light.cpp b/toonz/sources/stdfx/ino_blend_vivid_light.cpp index 1c1fac1..3a93893 100644 --- a/toonz/sources/stdfx/ino_blend_vivid_light.cpp +++ b/toonz/sources/stdfx/ino_blend_vivid_light.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" /* tnzbase --> Source Files --> tfx --> binaryFx.cppを参照 */ -class ino_blend_vivid_light : public TBlendForeBackRasterFx { +class ino_blend_vivid_light final : public TBlendForeBackRasterFx { FX_PLUGIN_DECLARATION(ino_blend_vivid_light) TRasterFxPort m_up; TRasterFxPort m_down; diff --git a/toonz/sources/stdfx/ino_blur.cpp b/toonz/sources/stdfx/ino_blur.cpp index ba4552f..7f7e240 100644 --- a/toonz/sources/stdfx/ino_blur.cpp +++ b/toonz/sources/stdfx/ino_blur.cpp @@ -6,7 +6,7 @@ #include "ino_common.h" #include "igs_gaussian_blur.h" //------------------------------------------------------------ -class ino_blur : public TStandardRasterFx { +class ino_blur final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_blur) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_channel_selector.cpp b/toonz/sources/stdfx/ino_channel_selector.cpp index 3c23122..cb2d4e5 100644 --- a/toonz/sources/stdfx/ino_channel_selector.cpp +++ b/toonz/sources/stdfx/ino_channel_selector.cpp @@ -6,7 +6,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_channel_selector : public TStandardRasterFx { +class ino_channel_selector final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_channel_selector) TRasterFxPort m_source1; diff --git a/toonz/sources/stdfx/ino_density.cpp b/toonz/sources/stdfx/ino_density.cpp index b5f7a79..89f728c 100644 --- a/toonz/sources/stdfx/ino_density.cpp +++ b/toonz/sources/stdfx/ino_density.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_density : public TStandardRasterFx { +class ino_density final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_density) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_fog.cpp b/toonz/sources/stdfx/ino_fog.cpp index 385932b..eb09892 100644 --- a/toonz/sources/stdfx/ino_fog.cpp +++ b/toonz/sources/stdfx/ino_fog.cpp @@ -5,7 +5,7 @@ #include "ino_common.h" #include "igs_fog.h" //------------------------------------------------------------ -class ino_fog : public TStandardRasterFx { +class ino_fog final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_fog) TRasterFxPort m_input; TDoubleParamP m_radius; diff --git a/toonz/sources/stdfx/ino_hls_add.cpp b/toonz/sources/stdfx/ino_hls_add.cpp index 0966fe0..54fe413 100644 --- a/toonz/sources/stdfx/ino_hls_add.cpp +++ b/toonz/sources/stdfx/ino_hls_add.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_hls_add : public TStandardRasterFx { +class ino_hls_add final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_hls_add) TRasterFxPort m_input; TRasterFxPort m_noise; diff --git a/toonz/sources/stdfx/ino_hls_adjust.cpp b/toonz/sources/stdfx/ino_hls_adjust.cpp index 82a67e6..1d784d4 100644 --- a/toonz/sources/stdfx/ino_hls_adjust.cpp +++ b/toonz/sources/stdfx/ino_hls_adjust.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_hls_adjust : public TStandardRasterFx { +class ino_hls_adjust final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_hls_adjust) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_hls_noise.cpp b/toonz/sources/stdfx/ino_hls_noise.cpp index 65c63d3..2e3fc2c 100644 --- a/toonz/sources/stdfx/ino_hls_noise.cpp +++ b/toonz/sources/stdfx/ino_hls_noise.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_hls_noise : public TStandardRasterFx { +class ino_hls_noise final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_hls_noise) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_hsv_add.cpp b/toonz/sources/stdfx/ino_hsv_add.cpp index f9791c2..a7aa589 100644 --- a/toonz/sources/stdfx/ino_hsv_add.cpp +++ b/toonz/sources/stdfx/ino_hsv_add.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_hsv_add : public TStandardRasterFx { +class ino_hsv_add final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_hsv_add) TRasterFxPort m_input; TRasterFxPort m_noise; diff --git a/toonz/sources/stdfx/ino_hsv_adjust.cpp b/toonz/sources/stdfx/ino_hsv_adjust.cpp index 21a863d..23c909a 100644 --- a/toonz/sources/stdfx/ino_hsv_adjust.cpp +++ b/toonz/sources/stdfx/ino_hsv_adjust.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_hsv_adjust : public TStandardRasterFx { +class ino_hsv_adjust final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_hsv_adjust) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_hsv_noise.cpp b/toonz/sources/stdfx/ino_hsv_noise.cpp index 63eb436..62eefa2 100644 --- a/toonz/sources/stdfx/ino_hsv_noise.cpp +++ b/toonz/sources/stdfx/ino_hsv_noise.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_hsv_noise : public TStandardRasterFx { +class ino_hsv_noise final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_hsv_noise) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_level_auto.cpp b/toonz/sources/stdfx/ino_level_auto.cpp index 38b6381..2260b66 100644 --- a/toonz/sources/stdfx/ino_level_auto.cpp +++ b/toonz/sources/stdfx/ino_level_auto.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_level_auto : public TStandardRasterFx { +class ino_level_auto final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_level_auto) TRasterFxPort m_input; TDoubleParamP m_in_min_shift; diff --git a/toonz/sources/stdfx/ino_level_master.cpp b/toonz/sources/stdfx/ino_level_master.cpp index f028f61..aab5e30 100644 --- a/toonz/sources/stdfx/ino_level_master.cpp +++ b/toonz/sources/stdfx/ino_level_master.cpp @@ -5,7 +5,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_level_master : public TStandardRasterFx { +class ino_level_master final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_level_master) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_level_rgba.cpp b/toonz/sources/stdfx/ino_level_rgba.cpp index 76460d5..74a9dfc 100644 --- a/toonz/sources/stdfx/ino_level_rgba.cpp +++ b/toonz/sources/stdfx/ino_level_rgba.cpp @@ -5,7 +5,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_level_rgba : public TStandardRasterFx { +class ino_level_rgba final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_level_rgba) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_line_blur.cpp b/toonz/sources/stdfx/ino_line_blur.cpp index 057884e..282b5d3 100644 --- a/toonz/sources/stdfx/ino_line_blur.cpp +++ b/toonz/sources/stdfx/ino_line_blur.cpp @@ -1225,7 +1225,7 @@ typedef unsigned short uint16_t; #endif /* x,yポイント座標のリストノード、画素連結、及び、線分連結、機能付き */ -class pixel_point_node : public list_node { +class pixel_point_node final : public list_node { public: pixel_point_node() { int32_t ii; @@ -1351,7 +1351,7 @@ void pixel_point_node::print_xy_around(void) { #define OFF (0) #endif -class pixel_point_root : public list_root { +class pixel_point_root final : public list_root { public: pixel_point_root(void) { this->_i_mv_sw = OFF; @@ -1522,7 +1522,7 @@ int pixel_point_root::save(const char *cp_fname) { #define NG (-1) #endif -class pixel_line_node : public list_node { +class pixel_line_node final : public list_node { public: pixel_line_node() { this->_i32_point_count = 0; @@ -2463,7 +2463,7 @@ void pixel_line_node::smooth_expand(int32_t i32_smooth_retry) { #include "igs_line_blur.h" // "list_root.h" "calculator_geometry.h" "pixel_point_root.h" "pixel_line_root.h" -class pixel_select_same_way_node : public list_node { +class pixel_select_same_way_node final : public list_node { public: pixel_select_same_way_node(void) { this->clp_point_middle = NULL; @@ -2485,7 +2485,7 @@ public: private: }; -class pixel_select_same_way_root : public list_root { +class pixel_select_same_way_root final : public list_root { public: pixel_select_same_way_root(void) { this->_i_mv_sw = OFF; @@ -2781,7 +2781,7 @@ void pixel_select_same_way_root::get_vector(double *dp_xv, double *dp_yv) { #include "igs_line_blur.h" // "list_root.h" "calculator_geometry.h" "pixel_point_root.h" "pixel_line_node.h" "pixel_select_same_way.h" -class pixel_line_root : public list_root { +class pixel_line_root final : public list_root { public: pixel_line_root(void) { this->_i_mv_sw = OFF; @@ -3991,7 +3991,7 @@ int pixel_line_root::save_expand_vector(const char *cp_fname) { #include "igs_line_blur.h" // "list_root.h" "calculator_geometry.h" "pixel_point_root.h" "pixel_line_root.h" -class pixel_select_curve_blur_node : public list_node { +class pixel_select_curve_blur_node final : public list_node { public: pixel_select_curve_blur_node(void) { this->clp_line = NULL; @@ -4019,7 +4019,7 @@ public: private: }; -class pixel_select_curve_blur_root : public list_root { +class pixel_select_curve_blur_root final : public list_root { public: pixel_select_curve_blur_root(void) { this->_i_mv_sw = OFF; @@ -6494,7 +6494,7 @@ void igs::line_blur::convert( #include "ino_common.h" #include "igs_line_blur.h" //------------------------------------------------------------ -class ino_line_blur : public TStandardRasterFx { +class ino_line_blur final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_line_blur) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/ino_maxmin.cpp b/toonz/sources/stdfx/ino_maxmin.cpp index 1fac6e4..cf2a3ae 100644 --- a/toonz/sources/stdfx/ino_maxmin.cpp +++ b/toonz/sources/stdfx/ino_maxmin.cpp @@ -7,7 +7,7 @@ namespace { const double smoothing_edge_ = 1.0; } //------------------------------------------------------------ -class ino_maxmin : public TStandardRasterFx { +class ino_maxmin final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_maxmin) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_median.cpp b/toonz/sources/stdfx/ino_median.cpp index 8fd19bc..9ccaf23 100644 --- a/toonz/sources/stdfx/ino_median.cpp +++ b/toonz/sources/stdfx/ino_median.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_median : public TStandardRasterFx { +class ino_median final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_median) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_median_filter.cpp b/toonz/sources/stdfx/ino_median_filter.cpp index cc7d5e7..9e90011 100644 --- a/toonz/sources/stdfx/ino_median_filter.cpp +++ b/toonz/sources/stdfx/ino_median_filter.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_median_filter : public TStandardRasterFx { +class ino_median_filter final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_median_filter) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_motion_blur.cpp b/toonz/sources/stdfx/ino_motion_blur.cpp index 9c856f6..7acfca7 100644 --- a/toonz/sources/stdfx/ino_motion_blur.cpp +++ b/toonz/sources/stdfx/ino_motion_blur.cpp @@ -5,7 +5,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_motion_blur : public TStandardRasterFx { +class ino_motion_blur final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_motion_blur) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/ino_motion_wind.cpp b/toonz/sources/stdfx/ino_motion_wind.cpp index f577dd9..d642e0a 100644 --- a/toonz/sources/stdfx/ino_motion_wind.cpp +++ b/toonz/sources/stdfx/ino_motion_wind.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_motion_wind : public TStandardRasterFx { +class ino_motion_wind final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_motion_wind) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/ino_negate.cpp b/toonz/sources/stdfx/ino_negate.cpp index df10bc5..5fa8713 100644 --- a/toonz/sources/stdfx/ino_negate.cpp +++ b/toonz/sources/stdfx/ino_negate.cpp @@ -4,7 +4,7 @@ #include "ino_common.h" //------------------------------------------------------------ -class ino_negate : public TStandardRasterFx { +class ino_negate final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_negate) TRasterFxPort m_input; TBoolParamP m_red; diff --git a/toonz/sources/stdfx/ino_pn_clouds.cpp b/toonz/sources/stdfx/ino_pn_clouds.cpp index cb7576a..61f12a7 100644 --- a/toonz/sources/stdfx/ino_pn_clouds.cpp +++ b/toonz/sources/stdfx/ino_pn_clouds.cpp @@ -8,7 +8,7 @@ toonz6.4sg ではTStandardRasterFx toonz7.0 ではTStandardZeraryFx */ -class ino_pn_clouds : public TStandardZeraryFx { +class ino_pn_clouds final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(ino_pn_clouds) TDoubleParamP m_size; diff --git a/toonz/sources/stdfx/ino_radial_blur.cpp b/toonz/sources/stdfx/ino_radial_blur.cpp index c6754a8..b2e6888 100644 --- a/toonz/sources/stdfx/ino_radial_blur.cpp +++ b/toonz/sources/stdfx/ino_radial_blur.cpp @@ -11,7 +11,7 @@ namespace { const double ino_param_range = 100.0; } -class ino_radial_blur : public TStandardRasterFx { +class ino_radial_blur final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_radial_blur) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_spin_blur.cpp b/toonz/sources/stdfx/ino_spin_blur.cpp index 917e847..4a019bb 100644 --- a/toonz/sources/stdfx/ino_spin_blur.cpp +++ b/toonz/sources/stdfx/ino_spin_blur.cpp @@ -8,7 +8,7 @@ #include "igs_rotate_blur.h" //------------------------------------------------------------ -class ino_spin_blur : public TStandardRasterFx { +class ino_spin_blur final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_spin_blur) TRasterFxPort m_input; TRasterFxPort m_refer; diff --git a/toonz/sources/stdfx/ino_warp_hv.cpp b/toonz/sources/stdfx/ino_warp_hv.cpp index abdc4a2..6aa8841 100644 --- a/toonz/sources/stdfx/ino_warp_hv.cpp +++ b/toonz/sources/stdfx/ino_warp_hv.cpp @@ -5,7 +5,7 @@ #include "ino_common.h" #include "igs_warp.h" //------------------------------------------------------------ -class ino_warp_hv : public TStandardRasterFx { +class ino_warp_hv final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ino_warp_hv) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/iwa_adjustexposurefx.h b/toonz/sources/stdfx/iwa_adjustexposurefx.h index cc8a312..61269bf 100644 --- a/toonz/sources/stdfx/iwa_adjustexposurefx.h +++ b/toonz/sources/stdfx/iwa_adjustexposurefx.h @@ -15,7 +15,7 @@ struct float4 { float x, y, z, w; }; -class Iwa_AdjustExposureFx : public TStandardRasterFx { +class Iwa_AdjustExposureFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(Iwa_AdjustExposureFx) protected: diff --git a/toonz/sources/stdfx/iwa_directionalblurfx.h b/toonz/sources/stdfx/iwa_directionalblurfx.h index a6a7354..808e91b 100644 --- a/toonz/sources/stdfx/iwa_directionalblurfx.h +++ b/toonz/sources/stdfx/iwa_directionalblurfx.h @@ -21,7 +21,7 @@ struct int2 { int x, y; }; -class Iwa_DirectionalBlurFx : public TStandardRasterFx { +class Iwa_DirectionalBlurFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(Iwa_DirectionalBlurFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/iwa_gradientwarpfx.h b/toonz/sources/stdfx/iwa_gradientwarpfx.h index 5589142..6629390 100644 --- a/toonz/sources/stdfx/iwa_gradientwarpfx.h +++ b/toonz/sources/stdfx/iwa_gradientwarpfx.h @@ -21,7 +21,7 @@ struct int2 { int x, y; }; -class Iwa_GradientWarpFx : public TStandardRasterFx { +class Iwa_GradientWarpFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(Iwa_GradientWarpFx) protected: diff --git a/toonz/sources/stdfx/iwa_motionblurfx.h b/toonz/sources/stdfx/iwa_motionblurfx.h index 23fdc62..f7a0a31 100644 --- a/toonz/sources/stdfx/iwa_motionblurfx.h +++ b/toonz/sources/stdfx/iwa_motionblurfx.h @@ -36,7 +36,7 @@ enum PremultiTypes { SOURCE_IS_NOT_PREMUTIPLIED }; -class Iwa_MotionBlurCompFx : public MotionAwareBaseFx { +class Iwa_MotionBlurCompFx final : public MotionAwareBaseFx { FX_PLUGIN_DECLARATION(Iwa_MotionBlurCompFx) protected: diff --git a/toonz/sources/stdfx/iwa_particlesfx.h b/toonz/sources/stdfx/iwa_particlesfx.h index 73fef92..925f775 100644 --- a/toonz/sources/stdfx/iwa_particlesfx.h +++ b/toonz/sources/stdfx/iwa_particlesfx.h @@ -15,7 +15,7 @@ // Iwa_Particles Fx class //****************************************************************** -class Iwa_TiledParticlesFx : public TStandardZeraryFx { +class Iwa_TiledParticlesFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(Iwa_TiledParticlesFx) TFxPortDG m_source, m_control; diff --git a/toonz/sources/stdfx/iwa_particlesmanager.cpp b/toonz/sources/stdfx/iwa_particlesmanager.cpp index 84c2cd5..0a1159d 100644 --- a/toonz/sources/stdfx/iwa_particlesmanager.cpp +++ b/toonz/sources/stdfx/iwa_particlesmanager.cpp @@ -35,7 +35,8 @@ typedef std::map FramesMap; // Preliminaries //************************************************************************************************ -class Iwa_ParticlesManagerGenerator : public TRenderResourceManagerGenerator { +class Iwa_ParticlesManagerGenerator final + : public TRenderResourceManagerGenerator { public: Iwa_ParticlesManagerGenerator() : TRenderResourceManagerGenerator(true) {} diff --git a/toonz/sources/stdfx/iwa_particlesmanager.h b/toonz/sources/stdfx/iwa_particlesmanager.h index a98b5bb..71d6d44 100644 --- a/toonz/sources/stdfx/iwa_particlesmanager.h +++ b/toonz/sources/stdfx/iwa_particlesmanager.h @@ -26,7 +26,7 @@ class TRandom; //----------------------------------------------------------------------- -class Iwa_ParticlesManager : public TRenderResourceManager { +class Iwa_ParticlesManager final : public TRenderResourceManager { T_RENDER_RESOURCE_MANAGER public: @@ -51,7 +51,7 @@ public: void clear(); }; - struct FxData : public TSmartObject { + struct FxData final : public TSmartObject { DECLARE_CLASS_CODE QThreadStorage m_frames; diff --git a/toonz/sources/stdfx/iwa_perspectivedistortfx.h b/toonz/sources/stdfx/iwa_perspectivedistortfx.h index 09ba151..c479bbc 100644 --- a/toonz/sources/stdfx/iwa_perspectivedistortfx.h +++ b/toonz/sources/stdfx/iwa_perspectivedistortfx.h @@ -17,7 +17,7 @@ struct float4 { float x, y, z, w; }; -class Iwa_PerspectiveDistortFx : public TStandardRasterFx { +class Iwa_PerspectiveDistortFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(Iwa_PerspectiveDistortFx) protected: TRasterFxPort m_source; /*- 入力画像 -*/ diff --git a/toonz/sources/stdfx/iwa_pnperspectivefx.h b/toonz/sources/stdfx/iwa_pnperspectivefx.h index c95461d..127ec08 100644 --- a/toonz/sources/stdfx/iwa_pnperspectivefx.h +++ b/toonz/sources/stdfx/iwa_pnperspectivefx.h @@ -46,7 +46,7 @@ struct PN_Params { float p_evolution; }; -class Iwa_PNPerspectiveFx : public TStandardZeraryFx { +class Iwa_PNPerspectiveFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(Iwa_PNPerspectiveFx) TIntEnumParamP diff --git a/toonz/sources/stdfx/iwa_spectrumfx.h b/toonz/sources/stdfx/iwa_spectrumfx.h index 78a3ba4..6d73b75 100644 --- a/toonz/sources/stdfx/iwa_spectrumfx.h +++ b/toonz/sources/stdfx/iwa_spectrumfx.h @@ -19,7 +19,7 @@ struct float4 { float x, y, z, w; }; -class Iwa_SpectrumFx : public TStandardRasterFx { +class Iwa_SpectrumFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(Iwa_SpectrumFx) protected: diff --git a/toonz/sources/stdfx/iwa_tilefx.cpp b/toonz/sources/stdfx/iwa_tilefx.cpp index e56e5dd..a68201a 100644 --- a/toonz/sources/stdfx/iwa_tilefx.cpp +++ b/toonz/sources/stdfx/iwa_tilefx.cpp @@ -11,7 +11,7 @@ //============================================================================= -class Iwa_TileFx : public TStandardRasterFx { +class Iwa_TileFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(Iwa_TileFx) enum tileQuantity { eNoTile = 1, eOneTile = 2, eMultipleTiles = 3 }; diff --git a/toonz/sources/stdfx/kaleido.cpp b/toonz/sources/stdfx/kaleido.cpp index a7c7304..10646fb 100644 --- a/toonz/sources/stdfx/kaleido.cpp +++ b/toonz/sources/stdfx/kaleido.cpp @@ -12,7 +12,7 @@ namespace { -class KaleidoDistorter : public TDistorter { +class KaleidoDistorter final : public TDistorter { double m_angle; TAffine m_aff; TPointD m_shift; @@ -63,7 +63,7 @@ int KaleidoDistorter::invMap(const TPointD &p, TPointD *results) const { // Kaleido Fx //**************************************************************************** -class KaleidoFx : public TStandardRasterFx { +class KaleidoFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(KaleidoFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/linearwavefx.cpp b/toonz/sources/stdfx/linearwavefx.cpp index e7c3c72..0fbba0c 100644 --- a/toonz/sources/stdfx/linearwavefx.cpp +++ b/toonz/sources/stdfx/linearwavefx.cpp @@ -10,7 +10,7 @@ //------------------------------------------------------------------- -class LinearWaveFx : public TStandardRasterFx { +class LinearWaveFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(LinearWaveFx) protected: TRasterFxPort m_warped; diff --git a/toonz/sources/stdfx/localblurfx.cpp b/toonz/sources/stdfx/localblurfx.cpp index ca8c716..cf77e65 100644 --- a/toonz/sources/stdfx/localblurfx.cpp +++ b/toonz/sources/stdfx/localblurfx.cpp @@ -233,7 +233,7 @@ void doLocalBlur(TRasterPT rin, TRasterPT rcontrol, // LocalBlurFx implementation //******************************************************************************** -class LocalBlurFx : public TStandardRasterFx { +class LocalBlurFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(LocalBlurFx) protected: diff --git a/toonz/sources/stdfx/localtransparencyfx.cpp b/toonz/sources/stdfx/localtransparencyfx.cpp index 27db1ec..f978700 100644 --- a/toonz/sources/stdfx/localtransparencyfx.cpp +++ b/toonz/sources/stdfx/localtransparencyfx.cpp @@ -113,7 +113,7 @@ void drawCheckboard(TRaster32P &raster) { //------------------------------------------------------------------- -class LocalTransparencyFx : public TStandardRasterFx { +class LocalTransparencyFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(LocalTransparencyFx) protected: TRasterFxPort m_src, m_ref; diff --git a/toonz/sources/stdfx/mosaicfx.cpp b/toonz/sources/stdfx/mosaicfx.cpp index d2a176a..124d338 100644 --- a/toonz/sources/stdfx/mosaicfx.cpp +++ b/toonz/sources/stdfx/mosaicfx.cpp @@ -103,7 +103,7 @@ public: }; template -class SquareBuilder : public MaskCellBuilder { +class SquareBuilder final : public MaskCellBuilder { public: SquareBuilder(int cellLx, int cellLy, double radius, int wrap) : MaskCellBuilder(cellLx, cellLy, radius, wrap) { @@ -135,7 +135,7 @@ public: }; template -class CircleBuilder : public MaskCellBuilder { +class CircleBuilder final : public MaskCellBuilder { public: CircleBuilder(int cellLx, int cellLy, double radius, int wrap) : MaskCellBuilder(cellLx, cellLy, radius, wrap) { @@ -172,7 +172,7 @@ public: // Mosaic Fx //**************************************************************************** -class MosaicFx : public TStandardRasterFx { +class MosaicFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(MosaicFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/motionblurfx.cpp b/toonz/sources/stdfx/motionblurfx.cpp index f70c199..606d2df 100644 --- a/toonz/sources/stdfx/motionblurfx.cpp +++ b/toonz/sources/stdfx/motionblurfx.cpp @@ -415,7 +415,7 @@ public: const TRenderSettings &info) override; }; -class DirectionalBlurFx : public DirectionalBlurBaseFx +class DirectionalBlurFx final : public DirectionalBlurBaseFx { FX_PLUGIN_DECLARATION(DirectionalBlurFx) @@ -437,7 +437,7 @@ public: } }; -class MotionBlurFx : public DirectionalBlurBaseFx +class MotionBlurFx final : public DirectionalBlurBaseFx { FX_PLUGIN_DECLARATION(MotionBlurFx) diff --git a/toonz/sources/stdfx/multitonefx.cpp b/toonz/sources/stdfx/multitonefx.cpp index 1f80b44..89202f4 100644 --- a/toonz/sources/stdfx/multitonefx.cpp +++ b/toonz/sources/stdfx/multitonefx.cpp @@ -4,7 +4,7 @@ #include "tfxparam.h" #include "tspectrumparam.h" -class MultiToneFx : public TStandardRasterFx { +class MultiToneFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(MultiToneFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/noisefx.cpp b/toonz/sources/stdfx/noisefx.cpp index e05915b..0679a72 100644 --- a/toonz/sources/stdfx/noisefx.cpp +++ b/toonz/sources/stdfx/noisefx.cpp @@ -4,7 +4,7 @@ #include "tfxparam.h" #include "stdfx.h" -class NoiseFx : public TStandardRasterFx { +class NoiseFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(NoiseFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/palettefilterfx.cpp b/toonz/sources/stdfx/palettefilterfx.cpp index 3ff42ee..b90fb9a 100644 --- a/toonz/sources/stdfx/palettefilterfx.cpp +++ b/toonz/sources/stdfx/palettefilterfx.cpp @@ -6,7 +6,7 @@ //=================================================================== -class PaletteFilterFx : public TStandardRasterFx { +class PaletteFilterFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(PaletteFilterFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/particlesfx.h b/toonz/sources/stdfx/particlesfx.h index 57d9d82..2418b2c 100644 --- a/toonz/sources/stdfx/particlesfx.h +++ b/toonz/sources/stdfx/particlesfx.h @@ -11,7 +11,7 @@ // Particles Fx class //****************************************************************** -class ParticlesFx : public TStandardZeraryFx { +class ParticlesFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(ParticlesFx) TFxPortDG m_source, m_control; diff --git a/toonz/sources/stdfx/particlesmanager.cpp b/toonz/sources/stdfx/particlesmanager.cpp index 0353053..80380d6 100644 --- a/toonz/sources/stdfx/particlesmanager.cpp +++ b/toonz/sources/stdfx/particlesmanager.cpp @@ -31,7 +31,7 @@ typedef std::map FramesMap; // Preliminaries //************************************************************************************************ -class ParticlesManagerGenerator : public TRenderResourceManagerGenerator { +class ParticlesManagerGenerator final : public TRenderResourceManagerGenerator { public: ParticlesManagerGenerator() : TRenderResourceManagerGenerator(true) {} diff --git a/toonz/sources/stdfx/particlesmanager.h b/toonz/sources/stdfx/particlesmanager.h index 5202c0a..5f75ebb 100644 --- a/toonz/sources/stdfx/particlesmanager.h +++ b/toonz/sources/stdfx/particlesmanager.h @@ -19,7 +19,7 @@ class TRandom; //----------------------------------------------------------------------- -class ParticlesManager : public TRenderResourceManager { +class ParticlesManager final : public TRenderResourceManager { T_RENDER_RESOURCE_MANAGER public: @@ -41,7 +41,7 @@ public: void clear(); }; - struct FxData : public TSmartObject { + struct FxData final : public TSmartObject { DECLARE_CLASS_CODE QThreadStorage m_frames; diff --git a/toonz/sources/stdfx/perlinnoisefx.cpp b/toonz/sources/stdfx/perlinnoisefx.cpp index 2fc0de1..e2f9ab1 100644 --- a/toonz/sources/stdfx/perlinnoisefx.cpp +++ b/toonz/sources/stdfx/perlinnoisefx.cpp @@ -9,7 +9,7 @@ //================================================================== -class PerlinNoiseFx : public TStandardRasterFx { +class PerlinNoiseFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(PerlinNoiseFx) TRasterFxPort m_input; TIntEnumParamP m_type; diff --git a/toonz/sources/stdfx/posterizefx.cpp b/toonz/sources/stdfx/posterizefx.cpp index a90b4a8..fcb892c 100644 --- a/toonz/sources/stdfx/posterizefx.cpp +++ b/toonz/sources/stdfx/posterizefx.cpp @@ -16,7 +16,7 @@ void prepare_lut(int levels, std::vector &lut) { //=================================================================== -class PosterizeFx : public TStandardRasterFx { +class PosterizeFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(PosterizeFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/premultiplyfx.cpp b/toonz/sources/stdfx/premultiplyfx.cpp index aba74fe..6dab55d 100644 --- a/toonz/sources/stdfx/premultiplyfx.cpp +++ b/toonz/sources/stdfx/premultiplyfx.cpp @@ -5,7 +5,7 @@ #include "trop.h" //=================================================================== -class PremultiplyFx : public TStandardRasterFx { +class PremultiplyFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(PremultiplyFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/radialblurfx.cpp b/toonz/sources/stdfx/radialblurfx.cpp index eec9173..4344613 100644 --- a/toonz/sources/stdfx/radialblurfx.cpp +++ b/toonz/sources/stdfx/radialblurfx.cpp @@ -5,7 +5,7 @@ #include "tparamset.h" #include "tparamuiconcept.h" -class RadialBlurFx : public TStandardRasterFx { +class RadialBlurFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(RadialBlurFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/randomwavefx.cpp b/toonz/sources/stdfx/randomwavefx.cpp index 4123bc0..37e8c90 100644 --- a/toonz/sources/stdfx/randomwavefx.cpp +++ b/toonz/sources/stdfx/randomwavefx.cpp @@ -13,7 +13,7 @@ //------------------------------------------------------------------- -class RandomWaveFx : public TStandardRasterFx { +class RandomWaveFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(RandomWaveFx) protected: TRasterFxPort m_warped; diff --git a/toonz/sources/stdfx/raylitfx.cpp b/toonz/sources/stdfx/raylitfx.cpp index de90977..34d6f3c 100644 --- a/toonz/sources/stdfx/raylitfx.cpp +++ b/toonz/sources/stdfx/raylitfx.cpp @@ -109,7 +109,7 @@ int BaseRaylitFx::getMemoryRequirement(const TRectD &rect, double frame, //======================================================================================== -class RaylitFx : public BaseRaylitFx { +class RaylitFx final : public BaseRaylitFx { FX_PLUGIN_DECLARATION(RaylitFx) protected: @@ -178,7 +178,7 @@ void RaylitFx::doCompute(TTile &tileOut, double frame, //======================================================================================== -class ColorRaylitFx : public BaseRaylitFx { +class ColorRaylitFx final : public BaseRaylitFx { FX_PLUGIN_DECLARATION(ColorRaylitFx) public: diff --git a/toonz/sources/stdfx/rgbkeyfx.cpp b/toonz/sources/stdfx/rgbkeyfx.cpp index 5a85597..8a84e0b 100644 --- a/toonz/sources/stdfx/rgbkeyfx.cpp +++ b/toonz/sources/stdfx/rgbkeyfx.cpp @@ -7,7 +7,7 @@ #include "tparamset.h" -class RGBKeyFx : public TStandardRasterFx { +class RGBKeyFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(RGBKeyFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/rgbmcutfx.cpp b/toonz/sources/stdfx/rgbmcutfx.cpp index f060dbc..be812e1 100644 --- a/toonz/sources/stdfx/rgbmcutfx.cpp +++ b/toonz/sources/stdfx/rgbmcutfx.cpp @@ -6,7 +6,7 @@ #include "tparamset.h" -class RGBMCutFx : public TStandardRasterFx { +class RGBMCutFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(RGBMCutFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/rgbmfadefx.cpp b/toonz/sources/stdfx/rgbmfadefx.cpp index 71fe5bf..2a98420 100644 --- a/toonz/sources/stdfx/rgbmfadefx.cpp +++ b/toonz/sources/stdfx/rgbmfadefx.cpp @@ -8,7 +8,7 @@ //=================================================================== -class RGBMFadeFx : public TStandardRasterFx { +class RGBMFadeFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(RGBMFadeFx) TRasterFxPort m_input; TPixelParamP m_color; diff --git a/toonz/sources/stdfx/rgbmscalefx.cpp b/toonz/sources/stdfx/rgbmscalefx.cpp index 5cf8b8a..cb96e3a 100644 --- a/toonz/sources/stdfx/rgbmscalefx.cpp +++ b/toonz/sources/stdfx/rgbmscalefx.cpp @@ -7,7 +7,7 @@ //=================================================================== -class RGBMScaleFx : public TStandardRasterFx { +class RGBMScaleFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(RGBMScaleFx) TRasterFxPort m_input; TDoubleParamP m_red; diff --git a/toonz/sources/stdfx/ripplefx.cpp b/toonz/sources/stdfx/ripplefx.cpp index dd4d50a..126503d 100644 --- a/toonz/sources/stdfx/ripplefx.cpp +++ b/toonz/sources/stdfx/ripplefx.cpp @@ -12,7 +12,7 @@ //------------------------------------------------------------------- -class RippleFx : public TStandardRasterFx { +class RippleFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(RippleFx) protected: TRasterFxPort m_warped; diff --git a/toonz/sources/stdfx/rotationalblurfx.cpp b/toonz/sources/stdfx/rotationalblurfx.cpp index 92922a6..03b8fb2 100644 --- a/toonz/sources/stdfx/rotationalblurfx.cpp +++ b/toonz/sources/stdfx/rotationalblurfx.cpp @@ -6,7 +6,7 @@ #include "tparamset.h" #include "tparamuiconcept.h" -class SpinBlurFx : public TStandardRasterFx { +class SpinBlurFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(SpinBlurFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/saltpeppernoisefx.cpp b/toonz/sources/stdfx/saltpeppernoisefx.cpp index e51e0f0..3baa53a 100644 --- a/toonz/sources/stdfx/saltpeppernoisefx.cpp +++ b/toonz/sources/stdfx/saltpeppernoisefx.cpp @@ -8,7 +8,7 @@ //=================================================================== -class SaltPepperNoiseFx : public TStandardRasterFx { +class SaltPepperNoiseFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(SaltPepperNoiseFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/shaderfx.cpp b/toonz/sources/stdfx/shaderfx.cpp index e67c7d1..bb34203 100644 --- a/toonz/sources/stdfx/shaderfx.cpp +++ b/toonz/sources/stdfx/shaderfx.cpp @@ -157,7 +157,7 @@ inline void ceilRect(TRectD &rect) { // Shader Fx declaration //**************************************************************************** -class ShaderFx : public TStandardZeraryFx { +class ShaderFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(ShaderFx) const ShaderInterface *m_shaderInterface; //!< Shader fx 'description'. @@ -211,7 +211,7 @@ private: // ShaderFxDeclaration definition //**************************************************************************** -class ShaderFxDeclaration : public TFxDeclaration { +class ShaderFxDeclaration final : public TFxDeclaration { ShaderInterface m_shaderInterface; public: @@ -227,7 +227,7 @@ public: // ShadingContextManager definition //**************************************************************************** -class ShadingContextManager : public QObject { +class ShadingContextManager final : public QObject { mutable QMutex m_mutex; ShadingContext m_shadingContext; @@ -323,7 +323,7 @@ template class DV_EXPORT_API TFxDeclarationT; // ShadingContextManagerDelegate definition //**************************************************************************** -class MessageCreateContext : public TThread::Message { +class MessageCreateContext final : public TThread::Message { ShadingContextManager *man; public: @@ -336,7 +336,7 @@ public: } }; -class SCMDelegate : public TRenderResourceManager { +class SCMDelegate final : public TRenderResourceManager { T_RENDER_RESOURCE_MANAGER void onRenderInstanceStart(unsigned long id) override { @@ -355,7 +355,7 @@ class SCMDelegate : public TRenderResourceManager { //------------------------------------------------------------------- -class SCMDelegateGenerator : public TRenderResourceManagerGenerator { +class SCMDelegateGenerator final : public TRenderResourceManagerGenerator { public: SCMDelegateGenerator() : TRenderResourceManagerGenerator(false) { /* @@ -365,7 +365,7 @@ QCoreApplication itself has been created. The easiest way to do so is scheduling a slot to be executed as soon as event processing starts. */ - struct InstanceSCM : public TFunctorInvoker::BaseFunctor { + struct InstanceSCM final : public TFunctorInvoker::BaseFunctor { void operator()() override { ShadingContextManager::instance(); } }; diff --git a/toonz/sources/stdfx/sharpenfx.cpp b/toonz/sources/stdfx/sharpenfx.cpp index 22e23ef..ed34b2d 100644 --- a/toonz/sources/stdfx/sharpenfx.cpp +++ b/toonz/sources/stdfx/sharpenfx.cpp @@ -234,7 +234,7 @@ void ropSharpen(const TRasterPT &rin, TRasterPT &rout, /*---------------------------------------------------------------------------*/ -class SharpenFx : public TStandardRasterFx { +class SharpenFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(SharpenFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/solarizefx.cpp b/toonz/sources/stdfx/solarizefx.cpp index 26ceb80..fccf91c 100644 --- a/toonz/sources/stdfx/solarizefx.cpp +++ b/toonz/sources/stdfx/solarizefx.cpp @@ -21,7 +21,7 @@ void prepare_lut(double max, int edge, std::vector &lut) { //=================================================================== -class SolarizeFx : public TStandardRasterFx { +class SolarizeFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(SolarizeFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/squaregradientfx.cpp b/toonz/sources/stdfx/squaregradientfx.cpp index 368e1c0..be4bd48 100644 --- a/toonz/sources/stdfx/squaregradientfx.cpp +++ b/toonz/sources/stdfx/squaregradientfx.cpp @@ -9,7 +9,7 @@ #undef max //=================================================================== -class SquareGradientFx : public TStandardZeraryFx { +class SquareGradientFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(SquareGradientFx) TSpectrumParamP m_colors; TDoubleParamP m_size; diff --git a/toonz/sources/stdfx/stdfx.cpp b/toonz/sources/stdfx/stdfx.cpp index e6cdc67..603b9ee 100644 --- a/toonz/sources/stdfx/stdfx.cpp +++ b/toonz/sources/stdfx/stdfx.cpp @@ -23,7 +23,7 @@ bool isAlmostIsotropic(const TAffine &aff) { return aff.isIsotropic(0.001); } //================================================================== -class FadeFx : public TStandardRasterFx { +class FadeFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(FadeFx) TRasterFxPort m_input; TDoubleParamP m_value; @@ -67,7 +67,7 @@ public: //================================================================== -class SpiralFx : public TStandardZeraryFx { +class SpiralFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(SpiralFx) TDoubleParamP m_freq; TDoubleParamP m_phase; @@ -164,7 +164,7 @@ void SpiralFx::doCompute(TTile &tile, double frame, const TRenderSettings &ri) { //------------------------------------------------------------------ -class MultiLinearGradientFx : public TStandardZeraryFx { +class MultiLinearGradientFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(MultiLinearGradientFx) TDoubleParamP m_period; TDoubleParamP m_count; @@ -227,7 +227,7 @@ public: } }; -class LinearGradientFx : public TStandardZeraryFx { +class LinearGradientFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(LinearGradientFx) TDoubleParamP m_period; @@ -398,7 +398,7 @@ throw TException("MultiLinearGradientFx: unsupported Pixel Type"); //================================================================== -class RadialGradientFx : public TStandardZeraryFx { +class RadialGradientFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(RadialGradientFx) TDoubleParamP m_period; TDoubleParamP m_innerperiod; @@ -450,7 +450,7 @@ public: //================================================================== -class MultiRadialGradientFx : public TStandardZeraryFx { +class MultiRadialGradientFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(MultiRadialGradientFx) TDoubleParamP m_period; TDoubleParamP m_count; @@ -546,7 +546,7 @@ void RadialGradientFx::doCompute(TTile &tile, double frame, //------------------------------------------------------------------ -class LightSpotFx : public TStandardZeraryFx { +class LightSpotFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(LightSpotFx) TDoubleParamP m_softness; TDoubleParamP m_a; diff --git a/toonz/sources/stdfx/targetspotfx.cpp b/toonz/sources/stdfx/targetspotfx.cpp index 4732ec1..801f2fa 100644 --- a/toonz/sources/stdfx/targetspotfx.cpp +++ b/toonz/sources/stdfx/targetspotfx.cpp @@ -9,7 +9,7 @@ //================================================================== -class TargetSpotFx : public TStandardZeraryFx { +class TargetSpotFx final : public TStandardZeraryFx { FX_PLUGIN_DECLARATION(TargetSpotFx) TDoubleParamP m_z; diff --git a/toonz/sources/stdfx/texturefx.cpp b/toonz/sources/stdfx/texturefx.cpp index e8eaab8..7fe227b 100644 --- a/toonz/sources/stdfx/texturefx.cpp +++ b/toonz/sources/stdfx/texturefx.cpp @@ -8,7 +8,7 @@ //=================================================================== -class TextureFx : public TStandardRasterFx { +class TextureFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(TextureFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/tilefx.cpp b/toonz/sources/stdfx/tilefx.cpp index 624dda4..58bd91c 100644 --- a/toonz/sources/stdfx/tilefx.cpp +++ b/toonz/sources/stdfx/tilefx.cpp @@ -8,7 +8,7 @@ //============================================================================= -class TileFx : public TStandardRasterFx { +class TileFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(TileFx) enum tilingMode { eTile = 1, eTileHorizontally = 2, eTileVertically = 3 }; diff --git a/toonz/sources/stdfx/tonecurvefx.cpp b/toonz/sources/stdfx/tonecurvefx.cpp index 60a92a6..b2b689c 100644 --- a/toonz/sources/stdfx/tonecurvefx.cpp +++ b/toonz/sources/stdfx/tonecurvefx.cpp @@ -85,7 +85,7 @@ void fill_lut(QList points, std::vector &lut, bool isLinear) { //=================================================================== -class ToneCurveFx : public TStandardRasterFx { +class ToneCurveFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(ToneCurveFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/unmultiplyfx.cpp b/toonz/sources/stdfx/unmultiplyfx.cpp index ed5f81c..296e936 100644 --- a/toonz/sources/stdfx/unmultiplyfx.cpp +++ b/toonz/sources/stdfx/unmultiplyfx.cpp @@ -15,7 +15,7 @@ TPixel32 unmultiply(const TPixel32 &pix) { //=================================================================== -class UnmultiplyFx : public TStandardRasterFx { +class UnmultiplyFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(UnmultiplyFx) TRasterFxPort m_input; diff --git a/toonz/sources/stdfx/warp.cpp b/toonz/sources/stdfx/warp.cpp index 1f41079..755afda 100644 --- a/toonz/sources/stdfx/warp.cpp +++ b/toonz/sources/stdfx/warp.cpp @@ -27,7 +27,7 @@ inline double convert(const TPixel64 &pixel) { /*-----------------------------------------------------------------*/ template -class Warper : public TDistorter { +class Warper final : public TDistorter { public: TRasterPT m_rin; TRasterPT m_warper; diff --git a/toonz/sources/stdfx/warpfx.cpp b/toonz/sources/stdfx/warpfx.cpp index 4edd805..f2754c4 100644 --- a/toonz/sources/stdfx/warpfx.cpp +++ b/toonz/sources/stdfx/warpfx.cpp @@ -9,7 +9,7 @@ //------------------------------------------------------------------- -class WarpFx : public TStandardRasterFx { +class WarpFx final : public TStandardRasterFx { FX_PLUGIN_DECLARATION(WarpFx) protected: diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp index fd002e7..5d777ba 100644 --- a/toonz/sources/tcomposer/tcomposer.cpp +++ b/toonz/sources/tcomposer/tcomposer.cpp @@ -227,7 +227,7 @@ void tcomposerRunOutOfContMemHandler(unsigned long size) { //============================================================================================== -class MyMovieRenderListener : public MovieRenderer::Listener { +class MyMovieRenderListener final : public MovieRenderer::Listener { public: MyMovieRenderListener(const TFilePath &fp, int frameCount, QWaitCondition &renderCompleted, bool stereo) @@ -319,7 +319,7 @@ void MyMovieRenderListener::onSequenceCompleted(const TFilePath &fp) { //============================================================================================== -class MyMultimediaRenderListener : public MultimediaRenderer::Listener { +class MyMultimediaRenderListener final : public MultimediaRenderer::Listener { public: TFilePath m_fp; int m_frameCount; diff --git a/toonz/sources/tnzbase/stringtable.cpp b/toonz/sources/tnzbase/stringtable.cpp index 72171b1..ecad8af 100644 --- a/toonz/sources/tnzbase/stringtable.cpp +++ b/toonz/sources/tnzbase/stringtable.cpp @@ -14,7 +14,7 @@ namespace { //------------------------------------------------------------------- -class TStringTableImp : public TStringTable { +class TStringTableImp final : public TStringTable { public: bool m_initialized; diff --git a/toonz/sources/tnzbase/trasterfx.cpp b/toonz/sources/tnzbase/trasterfx.cpp index 0a23640..12bd377 100644 --- a/toonz/sources/tnzbase/trasterfx.cpp +++ b/toonz/sources/tnzbase/trasterfx.cpp @@ -212,7 +212,7 @@ void removeRenderCache(const std::string &alias) { //! Internal fx node which applies the implicit affine stored in the //! TRenderSettings structure, //! replacing the old TRasterFx::doCompute. -class TrFx : public TBaseRasterFx { +class TrFx final : public TBaseRasterFx { FX_DECLARATION(TrFx) TRasterFx *m_fx; @@ -360,7 +360,7 @@ FX_IDENTIFIER_IS_HIDDEN(TrFx, "trFx") // render // results. Please refer to the ResourceBuilder documentation in // tfxcachemanager.cpp -class FxResourceBuilder : public ResourceBuilder { +class FxResourceBuilder final : public ResourceBuilder { TRasterFxP m_rfx; double m_frame; const TRenderSettings *m_rs; diff --git a/toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO.h b/toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO.h index c5b2a8c..d2e3484 100644 --- a/toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO.h +++ b/toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO.h @@ -7,7 +7,7 @@ class TUSBScannerIOPD; -class TUSBScannerIO : public TScannerIO { +class TUSBScannerIO final : public TScannerIO { TUSBScannerIOPD *m_data; public: diff --git a/toonz/sources/tnzbase/tscanner/tscanner.cpp b/toonz/sources/tnzbase/tscanner/tscanner.cpp index c7330f3..2803436 100644 --- a/toonz/sources/tnzbase/tscanner/tscanner.cpp +++ b/toonz/sources/tnzbase/tscanner/tscanner.cpp @@ -329,7 +329,7 @@ Cleaner MyCleaner; // #define DUMMYSCAN #ifdef DUMMYSCAN -class TScannerDummy : public TScanner { +class TScannerDummy final : public TScanner { public: TScannerDummy() {} ~TScannerDummy() {} diff --git a/toonz/sources/tnzbase/tscanner/tscannerepson.cpp b/toonz/sources/tnzbase/tscanner/tscannerepson.cpp index 5058ebf..7b27402 100644 --- a/toonz/sources/tnzbase/tscanner/tscannerepson.cpp +++ b/toonz/sources/tnzbase/tscanner/tscannerepson.cpp @@ -75,7 +75,7 @@ static unsigned char NotReady = 1 << 6; #define log -class TScannerExpection : public TException { +class TScannerExpection final : public TException { TString m_scannerMsg; public: diff --git a/toonz/sources/tnzbase/tscanner/tscannerepson.h b/toonz/sources/tnzbase/tscanner/tscannerepson.h index d2afbbd..bcc036b 100644 --- a/toonz/sources/tnzbase/tscanner/tscannerepson.h +++ b/toonz/sources/tnzbase/tscanner/tscannerepson.h @@ -13,7 +13,7 @@ PLEASE DO NOT REMOVE unreferenced methods... they are useful for debugging :) max */ -class TScannerEpson : public TScanner { +class TScannerEpson final : public TScanner { enum SettingsMode { OLD_STYLE, NEW_STYLE }; TScannerIO *m_scannerIO; diff --git a/toonz/sources/tnzbase/tscanner/tscannertwain.h b/toonz/sources/tnzbase/tscanner/tscannertwain.h index b0fa85e..8805b82 100644 --- a/toonz/sources/tnzbase/tscanner/tscannertwain.h +++ b/toonz/sources/tnzbase/tscanner/tscannertwain.h @@ -5,7 +5,7 @@ #include "tscanner.h" -class TScannerTwain : public TScanner { +class TScannerTwain final : public TScanner { public: TScannerTwain(); ~TScannerTwain(); diff --git a/toonz/sources/tnzext/meshbuilder.cpp b/toonz/sources/tnzext/meshbuilder.cpp index ac4751d..a513132 100644 --- a/toonz/sources/tnzext/meshbuilder.cpp +++ b/toonz/sources/tnzext/meshbuilder.cpp @@ -182,7 +182,7 @@ inline void delete_(T t) { } template -struct Vector : public std::vector { +struct Vector final : public std::vector { Vector() : std::vector() {} ~Vector() { std::for_each(this->begin(), this->end(), delete_); } }; @@ -219,7 +219,7 @@ public: //-------------------------------------------------------------------------- -class BordersReader : public ImageMeshesReaderT { +class BordersReader final : public ImageMeshesReaderT { public: Vector m_borders; RasterBorder *m_current; diff --git a/toonz/sources/tnzext/meshutils.cpp b/toonz/sources/tnzext/meshutils.cpp index 9723cb7..c21f09c 100644 --- a/toonz/sources/tnzext/meshutils.cpp +++ b/toonz/sources/tnzext/meshutils.cpp @@ -244,8 +244,8 @@ public: //------------------------------------------------------------------------------- -struct LinearVertexColorFunction : public LinearColorFunction, - public NoColorFunction { +struct LinearVertexColorFunction final : public LinearColorFunction, + public NoColorFunction { LinearVertexColorFunction(const TMeshImage &meshImg, const PlasticDeformerDataGroup *group, double min, double max, double *cMin, double *cMax, @@ -257,8 +257,8 @@ struct LinearVertexColorFunction : public LinearColorFunction, //------------------------------------------------------------------------------- -struct LinearFaceColorFunction : public LinearColorFunction, - public NoColorFunction { +struct LinearFaceColorFunction final : public LinearColorFunction, + public NoColorFunction { LinearFaceColorFunction(const TMeshImage &meshImg, const PlasticDeformerDataGroup *group, double min, double max, double *cMin, double *cMax, diff --git a/toonz/sources/tnzext/plasticskeletondeformation.cpp b/toonz/sources/tnzext/plasticskeletondeformation.cpp index 5060025..fa49995 100644 --- a/toonz/sources/tnzext/plasticskeletondeformation.cpp +++ b/toonz/sources/tnzext/plasticskeletondeformation.cpp @@ -214,7 +214,7 @@ void SkVD::loadData(TIStream &is) { // PlasticSkeletonDeformation::Imp definition //************************************************************************************** -class PlasticSkeletonDeformation::Imp : public TParamObserver { +class PlasticSkeletonDeformation::Imp final : public TParamObserver { public: PlasticSkeletonDeformation *m_back; //!< Back-pointer to the interface class diff --git a/toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp b/toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp index cbd24e9..636f563 100644 --- a/toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp +++ b/toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp @@ -15,8 +15,8 @@ extern "C" { // Preliminaries //************************************************************************* -struct tlin::SuperMatrix : public ::SuperMatrix {}; -struct tlin::superlu_options_t : public ::superlu_options_t {}; +struct tlin::SuperMatrix final : public ::SuperMatrix {}; +struct tlin::superlu_options_t final : public ::superlu_options_t {}; //======================================================================= diff --git a/toonz/sources/tnztools/autofillpli.cpp b/toonz/sources/tnztools/autofillpli.cpp index 3912734..c9a51c0 100644 --- a/toonz/sources/tnztools/autofillpli.cpp +++ b/toonz/sources/tnztools/autofillpli.cpp @@ -59,7 +59,7 @@ static TPointD workB(0, 0); //============================================================================================== -class AreasAndPerimeterFormula : public TRegionFeatureFormula { +class AreasAndPerimeterFormula final : public TRegionFeatureFormula { double m_signedArea, m_perimeter; public: @@ -79,7 +79,7 @@ public: //--------------------------------------------------------------------------------------------- -class CentroidFormula : public TRegionFeatureFormula { +class CentroidFormula final : public TRegionFeatureFormula { TPointD m_centroid; double m_signedArea; diff --git a/toonz/sources/tnztools/bendertool.cpp b/toonz/sources/tnztools/bendertool.cpp index 43abd36..b98ef9f 100644 --- a/toonz/sources/tnztools/bendertool.cpp +++ b/toonz/sources/tnztools/bendertool.cpp @@ -108,7 +108,7 @@ void clearPointerMap(std::map *> &corners) { // Bender Tool //----------------------------------------------------------------------------- -class BenderTool : public TTool { +class BenderTool final : public TTool { private: TUndo *m_undo; bool m_atLeastOneIsChanged; diff --git a/toonz/sources/tnztools/brushtool.cpp b/toonz/sources/tnztools/brushtool.cpp index e1c81eb..f793231 100644 --- a/toonz/sources/tnztools/brushtool.cpp +++ b/toonz/sources/tnztools/brushtool.cpp @@ -408,7 +408,7 @@ void addStrokeToImage(TTool::Application *application, const TVectorImageP &vi, //========================================================================================================= -class RasterBrushUndo : public TRasterUndo { +class RasterBrushUndo final : public TRasterUndo { std::vector m_points; int m_styleId; bool m_selective; @@ -449,7 +449,7 @@ public: //========================================================================================================= -class RasterBluredBrushUndo : public TRasterUndo { +class RasterBluredBrushUndo final : public TRasterUndo { std::vector m_points; int m_styleId; bool m_selective; diff --git a/toonz/sources/tnztools/brushtool.h b/toonz/sources/tnztools/brushtool.h index 0cc6d22..3a87f8e 100644 --- a/toonz/sources/tnztools/brushtool.h +++ b/toonz/sources/tnztools/brushtool.h @@ -31,7 +31,7 @@ class BluredBrush; // Brush Data declaration //************************************************************************ -struct BrushData : public TPersist { +struct BrushData final : public TPersist { PERSIST_DECLARATION(BrushData) std::wstring m_name; @@ -104,7 +104,7 @@ private: // Brush Tool declaration //************************************************************************ -class BrushTool : public TTool { +class BrushTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(BrushTool) public: diff --git a/toonz/sources/tnztools/controlpointeditortool.cpp b/toonz/sources/tnztools/controlpointeditortool.cpp index c895884..ea96420 100644 --- a/toonz/sources/tnztools/controlpointeditortool.cpp +++ b/toonz/sources/tnztools/controlpointeditortool.cpp @@ -108,7 +108,7 @@ void getSegmentParameter(ControlPointEditorStroke *cpEditor, int beforeIndex, // ControlPointEditorTool //----------------------------------------------------------------------------- -class ControlPointEditorTool : public TTool { +class ControlPointEditorTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(ControlPointEditorTool) bool m_draw; diff --git a/toonz/sources/tnztools/controlpointselection.h b/toonz/sources/tnztools/controlpointselection.h index c2e42de..44fa20f 100644 --- a/toonz/sources/tnztools/controlpointselection.h +++ b/toonz/sources/tnztools/controlpointselection.h @@ -133,7 +133,7 @@ If updatePoints is true update dependent point after.*/ // ControlPointSelection //----------------------------------------------------------------------------- -class ControlPointSelection : public QObject, public TSelection { +class ControlPointSelection final : public QObject, public TSelection { Q_OBJECT private: diff --git a/toonz/sources/tnztools/cuttertool.cpp b/toonz/sources/tnztools/cuttertool.cpp index 1810f9c..9e93f7d 100644 --- a/toonz/sources/tnztools/cuttertool.cpp +++ b/toonz/sources/tnztools/cuttertool.cpp @@ -31,7 +31,7 @@ namespace { // UndoCutter //----------------------------------------------------------------------------- -class UndoCutter : public ToolUtils::TToolUndo { +class UndoCutter final : public ToolUtils::TToolUndo { int m_newStrokeId1; int m_newStrokeId2; int m_pos; @@ -151,7 +151,7 @@ public: // CutterTool //----------------------------------------------------------------------------- -class CutterTool : public TTool { +class CutterTool final : public TTool { public: bool m_mouseDown; diff --git a/toonz/sources/tnztools/edittool.cpp b/toonz/sources/tnztools/edittool.cpp index 2abca32..1f5749c 100644 --- a/toonz/sources/tnztools/edittool.cpp +++ b/toonz/sources/tnztools/edittool.cpp @@ -70,7 +70,7 @@ using EditToolGadgets::DragTool; // DragCenterTool //----------------------------------------------------------------------------- -class DragCenterTool : public DragTool { +class DragCenterTool final : public DragTool { TStageObjectId m_objId; int m_frame; @@ -241,7 +241,7 @@ public: // DragPositionTool //----------------------------------------------------------------------------- -class DragPositionTool : public DragChannelTool { +class DragPositionTool final : public DragChannelTool { bool m_lockPositionX; bool m_lockPositionY; @@ -282,7 +282,7 @@ public: // DragSplinePositionTool //----------------------------------------------------------------------------- -class DragSplinePositionTool : public DragChannelTool { +class DragSplinePositionTool final : public DragChannelTool { const TStroke *m_spline; std::vector m_lengthAtCPs; double m_offset; @@ -369,7 +369,7 @@ else return 0.0; // DragRotationTool //----------------------------------------------------------------------------- -class DragRotationTool : public DragChannelTool { +class DragRotationTool final : public DragChannelTool { TPointD m_lastPos; TPointD m_center; bool m_lockRotation; @@ -413,7 +413,7 @@ a = m_viewer->mouseToTool(gc) - m_curCenter; // DragIsotropicScaleTool //----------------------------------------------------------------------------- -class DragIsotropicScaleTool : public DragChannelTool { +class DragIsotropicScaleTool final : public DragChannelTool { TPointD m_center; double m_r0; bool m_lockGlobalScale; @@ -446,7 +446,7 @@ public: // DragScaleTool //----------------------------------------------------------------------------- -class DragScaleTool : public DragChannelTool { +class DragScaleTool final : public DragChannelTool { TPointD m_center; int m_constraint; @@ -521,7 +521,7 @@ public: // DragShearTool //----------------------------------------------------------------------------- -class DragShearTool : public DragChannelTool { +class DragShearTool final : public DragChannelTool { TPointD m_center; bool m_lockShearH; bool m_lockShearV; @@ -565,7 +565,7 @@ public: // DragZTool //----------------------------------------------------------------------------- -class DragZTool : public DragChannelTool { +class DragZTool final : public DragChannelTool { TPoint m_lastPos; TTool::Viewer *m_viewer; double m_dz; @@ -599,7 +599,7 @@ public: // EditTool //----------------------------------------------------------------------------- -class EditTool : public TTool { +class EditTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(EditTool) DragTool *m_dragTool; diff --git a/toonz/sources/tnztools/edittoolgadgets.cpp b/toonz/sources/tnztools/edittoolgadgets.cpp index 28e50e8..b3a545c 100644 --- a/toonz/sources/tnztools/edittoolgadgets.cpp +++ b/toonz/sources/tnztools/edittoolgadgets.cpp @@ -27,7 +27,7 @@ GLdouble FxGadget::m_selectedColor[3] = {0.2, 0.8, 0.1}; // FxGadgetUndo definition //************************************************************************************* -class FxGadgetUndo : public TUndo { +class FxGadgetUndo final : public TUndo { struct ParamData { TDoubleParamP m_param; double m_oldValue, m_newValue; @@ -93,7 +93,7 @@ public: // GadgetDragTool definition //************************************************************************************* -class GadgetDragTool : public DragTool { +class GadgetDragTool final : public DragTool { FxGadgetController *m_controller; FxGadget *m_gadget; @@ -219,7 +219,7 @@ void FxGadget::commitUndo() { // Specific Gadget Concepts definition //************************************************************************************* -class PointFxGadget : public FxGadget { +class PointFxGadget final : public FxGadget { TPointD m_pos; TDoubleParamP m_xParam, m_yParam; @@ -299,7 +299,7 @@ void PointFxGadget::leftButtonUp(const TPointD &pos, const TMouseEvent &) {} //============================================================================= -class RadiusFxGadget : public FxGadget { +class RadiusFxGadget final : public FxGadget { TDoubleParamP m_radius; TPointParamP m_center; @@ -367,7 +367,7 @@ void RadiusFxGadget::leftButtonUp(const TPointD &pos, const TMouseEvent &) {} //============================================================================= -class DistanceFxGadget : public FxGadget { +class DistanceFxGadget final : public FxGadget { TDoubleParamP m_distance, m_angle; int m_grabPos; @@ -451,7 +451,7 @@ void DistanceFxGadget::leftButtonUp(const TPointD &pos, const TMouseEvent &) {} //============================================================================= -class AngleFxGadget : public FxGadget { +class AngleFxGadget final : public FxGadget { TDoubleParamP m_param; TPointD m_pos; @@ -524,7 +524,7 @@ void AngleFxGadget::leftButtonUp(const TPointD &pos, const TMouseEvent &) {} //============================================================================= -class DiamondFxGadget : public FxGadget { +class DiamondFxGadget final : public FxGadget { TDoubleParamP m_param; public: @@ -588,7 +588,7 @@ void DiamondFxGadget::leftButtonDrag(const TPointD &pos, const TMouseEvent &) { //============================================================================= -class SizeFxGadget : public FxGadget { +class SizeFxGadget final : public FxGadget { TDoubleParamP m_lx, m_ly; public: @@ -652,7 +652,7 @@ void SizeFxGadget::leftButtonDrag(const TPointD &pos, const TMouseEvent &) { //============================================================================= -class RectFxGadget : public FxGadget { +class RectFxGadget final : public FxGadget { TDoubleParamP m_width, m_height; TPointParamP m_center; @@ -756,7 +756,7 @@ void RectFxGadget::leftButtonDrag(const TPointD &ppos, const TMouseEvent &) { //============================================================================= -class PolarFxGadget : public FxGadget { +class PolarFxGadget final : public FxGadget { TPointD m_pos; TDoubleParamP m_phiParam, m_lengthParam; @@ -828,7 +828,7 @@ public: //============================================================================= -class VectorFxGadget : public FxGadget { +class VectorFxGadget final : public FxGadget { TPointParamP m_pa, m_pb; int m_selected; @@ -885,7 +885,7 @@ public: //============================================================================= -class QuadFxGadget : public FxGadget { +class QuadFxGadget final : public FxGadget { TPointParamP m_pa, m_pb, m_pc, m_pd; public: diff --git a/toonz/sources/tnztools/edittoolgadgets.h b/toonz/sources/tnztools/edittoolgadgets.h index 4179e6b..27e6e12 100644 --- a/toonz/sources/tnztools/edittoolgadgets.h +++ b/toonz/sources/tnztools/edittoolgadgets.h @@ -110,7 +110,7 @@ public: } // EditToolGadgets namespace -class FxGadgetController : public QObject { +class FxGadgetController final : public QObject { Q_OBJECT TTool *m_tool; diff --git a/toonz/sources/tnztools/filltool.cpp b/toonz/sources/tnztools/filltool.cpp index 2e05847..542df42 100644 --- a/toonz/sources/tnztools/filltool.cpp +++ b/toonz/sources/tnztools/filltool.cpp @@ -88,7 +88,7 @@ inline int vectorFill(const TVectorImageP &img, const std::wstring &type, // VectorFillUndo //----------------------------------------------------------------------------- -class VectorFillUndo : public TToolUndo { +class VectorFillUndo final : public TToolUndo { int m_oldColorStyle; int m_newColorStyle; TPointD m_point; @@ -167,7 +167,7 @@ public: // VectorRectFillUndo //----------------------------------------------------------------------------- -class VectorRectFillUndo : public TToolUndo { +class VectorRectFillUndo final : public TToolUndo { std::vector *m_regionFillInformation; std::vector> *m_strokeFillInformation; TRectD m_selectionArea; @@ -257,7 +257,7 @@ public: // RasterFillUndo //----------------------------------------------------------------------------- -class RasterFillUndo : public TRasterUndo { +class RasterFillUndo final : public TRasterUndo { FillParameters m_params; bool m_saveboxOnly; @@ -327,7 +327,7 @@ public: // RasterRectFillUndo //----------------------------------------------------------------------------- -class RasterRectFillUndo : public TRasterUndo { +class RasterRectFillUndo final : public TRasterUndo { TRect m_fillArea; int m_paintId; std::wstring m_colorType; @@ -400,7 +400,7 @@ public: // RasterRectAutoFillUndo //----------------------------------------------------------------------------- -class RasterRectAutoFillUndo : public TRasterUndo { +class RasterRectAutoFillUndo final : public TRasterUndo { TRect m_rectToFill; TFrameId m_fidToLearn; bool m_onlyUnfilled; @@ -444,7 +444,7 @@ public: // RasterStrokeAutoFillUndo //----------------------------------------------------------------------------- -class RasterStrokeAutoFillUndo : public TRasterUndo { +class RasterStrokeAutoFillUndo final : public TRasterUndo { TTileSetCM32 *m_tileSet; public: @@ -482,7 +482,7 @@ public: // RasterRectAutoFillUndo //----------------------------------------------------------------------------- -class VectorAutoFillUndo : public TToolUndo { +class VectorAutoFillUndo final : public TToolUndo { std::vector *m_regionFillInformation; TRectD m_selectionArea; TStroke *m_selectingStroke; @@ -972,7 +972,7 @@ void SequencePainter::processSequence(TXshSimpleLevel *sl, TFrameId firstFid, // MultiAreaFiller : SequencePainter //----------------------------------------------------------------------------- -class MultiAreaFiller : public SequencePainter { +class MultiAreaFiller final : public SequencePainter { TRectD m_firstRect, m_lastRect; bool m_unfilledOnly; std::wstring m_colorType; @@ -1047,7 +1047,7 @@ public: // MultiFiller : SequencePainter //----------------------------------------------------------------------------- -class MultiFiller : public SequencePainter { +class MultiFiller final : public SequencePainter { TPointD m_firstPoint, m_lastPoint; FillParameters m_params; @@ -1666,7 +1666,7 @@ public: // Fill Tool //----------------------------------------------------------------------------- -class FillTool : public TTool { +class FillTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(FillTool) bool m_firstTime; diff --git a/toonz/sources/tnztools/fingertool.cpp b/toonz/sources/tnztools/fingertool.cpp index daf9dcd..0838d00 100644 --- a/toonz/sources/tnztools/fingertool.cpp +++ b/toonz/sources/tnztools/fingertool.cpp @@ -57,7 +57,7 @@ const int BackgroundStyle = 0; namespace { -class FingerUndo : public TRasterUndo { +class FingerUndo final : public TRasterUndo { std::vector m_points; int m_styleId; bool m_invert; @@ -242,7 +242,7 @@ void drawEmptyCircle(int thick, const TPointD &mousePos, bool isPencil, //----------------------------------------------------------------------------- -class FingerTool : public TTool { +class FingerTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(FingerTool) RasterStrokeGenerator *m_rasterTrack; diff --git a/toonz/sources/tnztools/fullcolorbrushtool.cpp b/toonz/sources/tnztools/fullcolorbrushtool.cpp index 45dce24..dfd740b 100644 --- a/toonz/sources/tnztools/fullcolorbrushtool.cpp +++ b/toonz/sources/tnztools/fullcolorbrushtool.cpp @@ -81,7 +81,7 @@ double computeThickness(int pressure, const TDoublePairProperty &property, //---------------------------------------------------------------------------------- -class FullColorBrushUndo : public ToolUtils::TFullColorRasterUndo { +class FullColorBrushUndo final : public ToolUtils::TFullColorRasterUndo { TPoint m_offset; QString m_id; diff --git a/toonz/sources/tnztools/fullcolorbrushtool.h b/toonz/sources/tnztools/fullcolorbrushtool.h index ca836d8..2eebc70 100644 --- a/toonz/sources/tnztools/fullcolorbrushtool.h +++ b/toonz/sources/tnztools/fullcolorbrushtool.h @@ -20,7 +20,7 @@ class FullColorBrushToolNotifier; // FullColor Brush Tool declaration //************************************************************************ -class FullColorBrushTool : public TTool { +class FullColorBrushTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(FullColorBrushTool) public: @@ -103,7 +103,7 @@ protected: //------------------------------------------------------------ -class FullColorBrushToolNotifier : public QObject { +class FullColorBrushToolNotifier final : public QObject { Q_OBJECT FullColorBrushTool *m_tool; diff --git a/toonz/sources/tnztools/fullcolorerasertool.cpp b/toonz/sources/tnztools/fullcolorerasertool.cpp index 10ea81d..3a66cc6 100644 --- a/toonz/sources/tnztools/fullcolorerasertool.cpp +++ b/toonz/sources/tnztools/fullcolorerasertool.cpp @@ -125,7 +125,7 @@ void eraseImage(const TRasterImageP &ri, const TRaster32P &image, //---------------------------------------------------------------------------------- -class RectFullColorUndo : public TFullColorRasterUndo { +class RectFullColorUndo final : public TFullColorRasterUndo { TRectD m_modifyArea; TStroke *m_stroke; std::wstring m_eraseType; @@ -180,7 +180,7 @@ public: //---------------------------------------------------------------------------------- -class FullColorEraserUndo : public TFullColorRasterUndo { +class FullColorEraserUndo final : public TFullColorRasterUndo { std::vector m_points; int m_size; double m_hardness; @@ -279,7 +279,7 @@ void eraseStroke(const TRasterImageP &ri, TStroke *stroke, // FullColorEraserTool definition //********************************************************************************** -class FullColorEraserTool : public TTool { +class FullColorEraserTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(FullColorEraserTool) public: diff --git a/toonz/sources/tnztools/geometrictool.cpp b/toonz/sources/tnztools/geometrictool.cpp index 854e500..bf6c80f 100644 --- a/toonz/sources/tnztools/geometrictool.cpp +++ b/toonz/sources/tnztools/geometrictool.cpp @@ -177,7 +177,7 @@ TRect drawBluredBrush(const TToonzImageP &ti, TStroke *stroke, int thick, //----------------------------------------------------------------------------- -class MultilinePrimitiveUndo : public TUndo { +class MultilinePrimitiveUndo final : public TUndo { std::vector m_oldVertex; std::vector m_newVertex; MultiLinePrimitive *m_tool; @@ -203,7 +203,7 @@ public: //----------------------------------------------------------------------------- -class FullColorBluredPrimitiveUndo : public UndoFullColorPencil { +class FullColorBluredPrimitiveUndo final : public UndoFullColorPencil { int m_thickness; double m_hardness; @@ -243,7 +243,7 @@ public: //----------------------------------------------------------------------------- /*-- Hardness<100 のときの GeometricToolのUndo --*/ -class CMBluredPrimitiveUndo : public UndoRasterPencil { +class CMBluredPrimitiveUndo final : public UndoRasterPencil { int m_thickness; double m_hardness; bool m_selective; @@ -434,7 +434,7 @@ public: // Rectangle Primitive Class Declaration //----------------------------------------------------------------------------- -class RectanglePrimitive : public Primitive { +class RectanglePrimitive final : public Primitive { TRectD m_selectingRect; TPointD m_pos; TPointD m_startPoint; @@ -462,7 +462,7 @@ public: // Circle Primitive Class Declaration //----------------------------------------------------------------------------- -class CirclePrimitive : public Primitive { +class CirclePrimitive final : public Primitive { TPointD m_centre; TPointD m_pos; double m_radius; @@ -570,7 +570,7 @@ QString MultilinePrimitiveUndo::getToolName() { // Line Primitive Class Declaration //----------------------------------------------------------------------------- -class LinePrimitive : public MultiLinePrimitive { +class LinePrimitive final : public MultiLinePrimitive { public: LinePrimitive(PrimitiveParam *param, GeometricTool *tool, bool reasterTool) : MultiLinePrimitive(param, tool, reasterTool) { @@ -592,7 +592,7 @@ public: // Ellipse Primitive Class Declaration //----------------------------------------------------------------------------- -class EllipsePrimitive : public Primitive { +class EllipsePrimitive final : public Primitive { TPointD m_pos; TRectD m_selectingRect; TPointD m_startPoint; @@ -619,7 +619,7 @@ public: // Arc Primitive Class Declaration //----------------------------------------------------------------------------- -class ArcPrimitive : public Primitive { +class ArcPrimitive final : public Primitive { TStroke *m_stroke; TPointD m_startPoint, m_endPoint, m_centralPoint; int m_clickNumber; @@ -648,7 +648,7 @@ public: // Polygon Primitive Class Declaration //----------------------------------------------------------------------------- -class PolygonPrimitive : public Primitive { +class PolygonPrimitive final : public Primitive { TPointD m_startPoint, m_centre; double m_radius; TPixel32 m_color; @@ -672,7 +672,7 @@ public: // Geometric Tool //----------------------------------------------------------------------------- -class GeometricTool : public TTool { +class GeometricTool final : public TTool { protected: Primitive *m_primitive; std::map m_primitiveTable; diff --git a/toonz/sources/tnztools/hookselection.h b/toonz/sources/tnztools/hookselection.h index 55f766b..beb0ee5 100644 --- a/toonz/sources/tnztools/hookselection.h +++ b/toonz/sources/tnztools/hookselection.h @@ -15,7 +15,7 @@ // HookUndo //----------------------------------------------------------------------------- -class HookUndo : public TUndo { +class HookUndo final : public TUndo { HookSet m_oldHooks, m_newHooks; TXshLevelP m_level; @@ -36,7 +36,7 @@ public: // HooksData //----------------------------------------------------------------------------- -class HooksData : public DvMimeData { +class HooksData final : public DvMimeData { struct HookPosition { int m_id; TPointD m_aPos, m_bPos; @@ -66,7 +66,7 @@ public: // (1=A,2=B) //----------------------------------------------------------------------------- -class HookSelection : public TSelection { +class HookSelection final : public TSelection { TXshLevelP m_level; std::set> m_hooks; // hookId, side : 1=A 2=B diff --git a/toonz/sources/tnztools/hooktool.cpp b/toonz/sources/tnztools/hooktool.cpp index eea70cd..4d98c8c 100644 --- a/toonz/sources/tnztools/hooktool.cpp +++ b/toonz/sources/tnztools/hooktool.cpp @@ -66,7 +66,7 @@ public: // HookTool //----------------------------------------------------------------------------- -class HookTool : public TTool { +class HookTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(HookTool) HookSelection m_selection; diff --git a/toonz/sources/tnztools/imagegrouping.cpp b/toonz/sources/tnztools/imagegrouping.cpp index 0b477a9..0aa69ef 100644 --- a/toonz/sources/tnztools/imagegrouping.cpp +++ b/toonz/sources/tnztools/imagegrouping.cpp @@ -75,7 +75,7 @@ void ungroupWithoutUndo(TVectorImage *vimg, StrokeSelection *selection) { // GroupUndo //----------------------------------------------------------------------------- -class GroupUndo : public ToolUtils::TToolUndo { +class GroupUndo final : public ToolUtils::TToolUndo { std::auto_ptr m_selection; public: @@ -102,7 +102,7 @@ public: // UngroupUndo //----------------------------------------------------------------------------- -class UngroupUndo : public ToolUtils::TToolUndo { +class UngroupUndo final : public ToolUtils::TToolUndo { std::auto_ptr m_selection; public: @@ -129,7 +129,7 @@ public: // MoveGroupUndo //----------------------------------------------------------------------------- -class MoveGroupUndo : public ToolUtils::TToolUndo { +class MoveGroupUndo final : public ToolUtils::TToolUndo { UCHAR m_moveType; int m_refStroke, m_count, m_moveBefore; std::vector> m_selectedGroups; diff --git a/toonz/sources/tnztools/irontool.cpp b/toonz/sources/tnztools/irontool.cpp index 6b58e07..f583eae 100644 --- a/toonz/sources/tnztools/irontool.cpp +++ b/toonz/sources/tnztools/irontool.cpp @@ -43,7 +43,7 @@ inline bool isIncluded(int index, int left, int rigth) { // IronTool //----------------------------------------------------------------------------- -class IronTool : public TTool { +class IronTool final : public TTool { TStroke *m_strokeRef, *m_oldStroke; TUndo *m_undo; diff --git a/toonz/sources/tnztools/magnettool.cpp b/toonz/sources/tnztools/magnettool.cpp index eea903c..ecbfeff 100644 --- a/toonz/sources/tnztools/magnettool.cpp +++ b/toonz/sources/tnztools/magnettool.cpp @@ -106,7 +106,7 @@ void drawQuadratic(const TQuadratic &quad, double pixelSize) { // MagnetTool //----------------------------------------------------------------------------- -class MagnetTool : public TTool { +class MagnetTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(MagnetTool) bool m_active; diff --git a/toonz/sources/tnztools/paintbrushtool.cpp b/toonz/sources/tnztools/paintbrushtool.cpp index 9d6f2fa..a7dd097 100644 --- a/toonz/sources/tnztools/paintbrushtool.cpp +++ b/toonz/sources/tnztools/paintbrushtool.cpp @@ -61,7 +61,7 @@ const int BackgroundStyle = 0; namespace { -class BrushUndo : public TRasterUndo { +class BrushUndo final : public TRasterUndo { std::vector m_points; int m_styleId; bool m_selective; @@ -246,7 +246,7 @@ void drawEmptyCircle(int thick, const TPointD &mousePos, bool isPencil, //----------------------------------------------------------------------------- -class PaintBrushTool : public TTool { +class PaintBrushTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(PaintBrushTool) RasterStrokeGenerator *m_rasterTrack; diff --git a/toonz/sources/tnztools/plastictool.cpp b/toonz/sources/tnztools/plastictool.cpp index ea07900..3822f05 100644 --- a/toonz/sources/tnztools/plastictool.cpp +++ b/toonz/sources/tnztools/plastictool.cpp @@ -194,7 +194,7 @@ void invalidateXsheet() { // Mime definitions //**************************************************************************************** -struct PlasticSkeletonPMime : public DvMimeData { +struct PlasticSkeletonPMime final : public DvMimeData { PlasticSkeletonP m_skeleton; public: @@ -208,7 +208,7 @@ public: void releaseData() override { m_skeleton = PlasticSkeletonP(); } }; -struct SkDPMime : public DvMimeData { +struct SkDPMime final : public DvMimeData { SkDP m_sd; public: @@ -233,7 +233,7 @@ public: namespace { -class SetVertexNameUndo : public TUndo { +class SetVertexNameUndo final : public TUndo { int m_row, m_col; //!< Xsheet coordinates int m_v; //!< Changed vertex @@ -298,7 +298,7 @@ public: //======================================================================== -class PasteDeformationUndo : public TUndo { +class PasteDeformationUndo final : public TUndo { int m_col; //!< Affected column SkDP m_oldSd, m_newSd; //!< The skeleton deformations @@ -346,7 +346,7 @@ PlasticTool::TemporaryActivation::~TemporaryActivation() { // PlasticToolOptionsBox::SkelIdComboBox definition //**************************************************************************************** -class PlasticToolOptionsBox::SkelIdsComboBox : public QComboBox { +class PlasticToolOptionsBox::SkelIdsComboBox final : public QComboBox { public: SkelIdsComboBox(QWidget *parent = 0) : QComboBox(parent) { updateSkeletonsList(); @@ -879,7 +879,7 @@ void PlasticTool::onChange() { static bool refresh = false; // Accessible from locals since static struct locals { - struct RefreshFunctor : public TFunctorInvoker::BaseFunctor { + struct RefreshFunctor final : public TFunctorInvoker::BaseFunctor { 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 1b11677..721db5e 100644 --- a/toonz/sources/tnztools/plastictool.h +++ b/toonz/sources/tnztools/plastictool.h @@ -56,10 +56,10 @@ // PlasticTool declaration //**************************************************************************************** -class PlasticTool : public QObject, - public TTool, - public TParamObserver, - public TSelection::View { +class PlasticTool final : public QObject, + public TTool, + public TParamObserver, + public TSelection::View { Q_OBJECT friend class PlasticToolOptionsBox; @@ -73,7 +73,7 @@ public: ~TemporaryActivation(); }; - struct MeshIndex : public tcg::safe_bool { + struct MeshIndex final : public tcg::safe_bool { int m_meshIdx, //!< Mesh index in a TMeshImage m_idx; //!< Index in the referenced mesh @@ -397,8 +397,8 @@ private slots: // PlasticToolOptionsBox declaration //**************************************************************************************** -class PlasticToolOptionsBox : public GenericToolOptionsBox, - public TProperty::Listener { +class PlasticToolOptionsBox final : public GenericToolOptionsBox, + public TProperty::Listener { Q_OBJECT public: diff --git a/toonz/sources/tnztools/plastictool_animate.cpp b/toonz/sources/tnztools/plastictool_animate.cpp index 7bbe862..465af7f 100644 --- a/toonz/sources/tnztools/plastictool_animate.cpp +++ b/toonz/sources/tnztools/plastictool_animate.cpp @@ -16,7 +16,7 @@ using namespace PlasticToolLocals; namespace { -class AnimateValuesUndo : public TUndo { +class AnimateValuesUndo final : public TUndo { int m_row, m_col; //!< Xsheet coordinates int m_v; //!< Moved vertex diff --git a/toonz/sources/tnztools/plastictool_build.cpp b/toonz/sources/tnztools/plastictool_build.cpp index f6056a9..c797519 100644 --- a/toonz/sources/tnztools/plastictool_build.cpp +++ b/toonz/sources/tnztools/plastictool_build.cpp @@ -193,7 +193,7 @@ public: //------------------------------------------------------------------------ -class AddVertexUndo : public VertexUndo { +class AddVertexUndo final : public VertexUndo { public: AddVertexUndo(int vParent, const PlasticSkeletonVertex &vx) { m_vParent = vParent, m_vx = vx; @@ -210,7 +210,7 @@ public: //------------------------------------------------------------------------ -class RemoveVertexUndo : public VertexUndo { +class RemoveVertexUndo final : public VertexUndo { public: RemoveVertexUndo(int v) { assert(v >= 0); @@ -227,7 +227,7 @@ public: //======================================================================== -class InsertVertexUndo : public VertexUndo { +class InsertVertexUndo final : public VertexUndo { public: InsertVertexUndo(int e, const PlasticSkeletonVertex &vx) { const PlasticSkeleton &skeleton = *l_plasticTool.skeleton(); @@ -298,7 +298,7 @@ public: //------------------------------------------------------------------------ -class RemoveSkeletonUndo_WithKeyframes : public RemoveSkeletonUndo { +class RemoveSkeletonUndo_WithKeyframes final : public RemoveSkeletonUndo { mutable std::vector m_skelIdsKeyframes; //!< Skeleton Ids param curve keyframes //!< for m_skelId @@ -351,7 +351,7 @@ public: //======================================================================== -class SetSkeletonIdUndo : public TUndo { +class SetSkeletonIdUndo final : public TUndo { int m_row, m_col; //!< Xsheet coordinates int m_skelId; //!< The new skeleton id value @@ -423,7 +423,7 @@ public: //======================================================================== -class MoveVertexUndo_Build : public TUndo { +class MoveVertexUndo_Build final : public TUndo { int m_row, m_col; //!< Xsheet coordinates std::vector m_vIdxs; //!< Moved vertices diff --git a/toonz/sources/tnztools/plastictool_meshedit.cpp b/toonz/sources/tnztools/plastictool_meshedit.cpp index 0b6d117..2cd70e4 100644 --- a/toonz/sources/tnztools/plastictool_meshedit.cpp +++ b/toonz/sources/tnztools/plastictool_meshedit.cpp @@ -640,7 +640,7 @@ bool cutMesh(TMeshImage &mi, const PlasticTool::MeshSelection &edgesSelection) { namespace { -class MoveVertexUndo_Mesh : public TUndo { +class MoveVertexUndo_Mesh final : public TUndo { int m_row, m_col; //!< Xsheet coordinates std::vector m_vIdxs; //!< Moved vertices @@ -688,7 +688,7 @@ public: //============================================================================== -class SwapEdgeUndo : public TUndo { +class SwapEdgeUndo final : public TUndo { int m_row, m_col; //!< Xsheet coordinates mutable MeshIndex m_edgeIdx; //!< Edge index @@ -750,7 +750,7 @@ public: //============================================================================== -class CollapseEdgeUndo : public TTextureMeshUndo { +class CollapseEdgeUndo final : public TTextureMeshUndo { int m_eIdx; //!< Collapsed edge index public: @@ -801,7 +801,7 @@ public: //============================================================================== -class SplitEdgeUndo : public TTextureMeshUndo { +class SplitEdgeUndo final : public TTextureMeshUndo { int m_eIdx; //!< Split edge index public: @@ -855,7 +855,7 @@ public: //============================================================================== -class CutEdgesUndo : public TUndo { +class CutEdgesUndo final : public TUndo { int m_row, m_col; //!< Xsheet coordinates TMeshImageP m_origImage; //!< Clone of the original image diff --git a/toonz/sources/tnztools/plastictool_rigidity.cpp b/toonz/sources/tnztools/plastictool_rigidity.cpp index dbb77fe..dd584e8 100644 --- a/toonz/sources/tnztools/plastictool_rigidity.cpp +++ b/toonz/sources/tnztools/plastictool_rigidity.cpp @@ -38,7 +38,7 @@ enum { RIGID_IDX = 0, FLEX_IDX }; namespace { -class PaintRigidityUndo : public TUndo { +class PaintRigidityUndo final : public TUndo { TXshCell m_cell; //!< Affected image (cell == level + frame) std::vector> m_vertices; //!< Affected vertices @@ -103,7 +103,7 @@ public: namespace { -class RigidityPainter : public tcg::polymorphic { +class RigidityPainter final : public tcg::polymorphic { std::vector> m_oldRigidities; //!< The original values of painted vertices double m_sqRadius, m_value; //!< Drawing parameters diff --git a/toonz/sources/tnztools/pumptool.cpp b/toonz/sources/tnztools/pumptool.cpp index 50d8d68..2dd0304 100644 --- a/toonz/sources/tnztools/pumptool.cpp +++ b/toonz/sources/tnztools/pumptool.cpp @@ -32,7 +32,7 @@ using namespace ToolUtils; // PumpTool declaration //***************************************************************************** -class PumpTool : public TTool { +class PumpTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(PumpTool) int m_strokeStyleId, m_strokeIndex; //!< Edited stroke indices diff --git a/toonz/sources/tnztools/rastererasertool.cpp b/toonz/sources/tnztools/rastererasertool.cpp index 97ebaf9..9cedad2 100644 --- a/toonz/sources/tnztools/rastererasertool.cpp +++ b/toonz/sources/tnztools/rastererasertool.cpp @@ -83,7 +83,7 @@ namespace { RECTERASE */ -class RectRasterUndo : public TRasterUndo { +class RectRasterUndo final : public TRasterUndo { TRectD m_modifyArea; TStroke *m_stroke; int m_styleId; @@ -150,7 +150,7 @@ public: Viene realizzata la funzione di "UNDO" per il cancellino nell'opzione NORMALERAS */ -class RasterEraserUndo : public TRasterUndo { +class RasterEraserUndo final : public TRasterUndo { std::vector m_points; int m_styleId; bool m_selective; @@ -197,7 +197,7 @@ public: //===================================================================== -class RasterBluredEraserUndo : public TRasterUndo { +class RasterBluredEraserUndo final : public TRasterUndo { std::vector m_points; int m_styleId; bool m_selective; @@ -442,7 +442,7 @@ void drawEmptyCircle(int thick, const TPointD &mousePos, bool isPencil, // //------------------------------------------------------------------------ -class EraserTool : public TTool { +class EraserTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(EraserTool) public: diff --git a/toonz/sources/tnztools/rasterselection.cpp b/toonz/sources/tnztools/rasterselection.cpp index f9ae666..2ef7f39 100644 --- a/toonz/sources/tnztools/rasterselection.cpp +++ b/toonz/sources/tnztools/rasterselection.cpp @@ -303,7 +303,7 @@ void pasteFloatingSelectionWithoutUndo(const TImageP &image, // UndoDeleteSelection //----------------------------------------------------------------------------- -class UndoDeleteSelection : public TUndo { +class UndoDeleteSelection final : public TUndo { static int m_id; TXshSimpleLevelP m_level; TFrameId m_frameId; @@ -379,7 +379,7 @@ int UndoDeleteSelection::m_id = 0; // UndoPasteSelection //----------------------------------------------------------------------------- -class UndoPasteSelection : public TUndo { +class UndoPasteSelection final : public TUndo { RasterSelection *m_currentSelection, m_newSelection; public: @@ -410,7 +410,7 @@ public: // UndoPasteFloatingSelection //----------------------------------------------------------------------------- -class UndoPasteFloatingSelection : public TUndo { +class UndoPasteFloatingSelection final : public TUndo { static int m_id; TXshCell m_imageCell; //!< Level/frame pair to the pasted-to image diff --git a/toonz/sources/tnztools/rasterselectiontool.h b/toonz/sources/tnztools/rasterselectiontool.h index c17af3a..bc02c7f 100644 --- a/toonz/sources/tnztools/rasterselectiontool.h +++ b/toonz/sources/tnztools/rasterselectiontool.h @@ -15,7 +15,7 @@ class VectorFreeDeformer; // RasterFreeDeformer //----------------------------------------------------------------------------- -class RasterFreeDeformer : public FreeDeformer { +class RasterFreeDeformer final : public FreeDeformer { TRasterP m_ras; TRasterP m_newRas; bool m_noAntialiasing; @@ -44,7 +44,7 @@ namespace DragSelectionTool { // UndoRasterDeform //----------------------------------------------------------------------------- -class UndoRasterDeform : public TUndo { +class UndoRasterDeform final : public TUndo { static int m_id; RasterSelectionTool *m_tool; std::string m_oldFloatingImageId, m_newFloatingImageId; @@ -75,7 +75,7 @@ public: // UndoRasterTransform //----------------------------------------------------------------------------- -class UndoRasterTransform : public TUndo { +class UndoRasterTransform final : public TUndo { RasterSelectionTool *m_tool; TAffine m_oldTransform, m_newTransform; TPointD m_oldCenter, m_newCenter; @@ -123,7 +123,7 @@ public: // RasterRotationTool //----------------------------------------------------------------------------- -class RasterRotationTool : public RasterDeformTool { +class RasterRotationTool final : public RasterDeformTool { Rotation *m_rotation; public: @@ -137,7 +137,7 @@ public: // RasterFreeDeformTool //----------------------------------------------------------------------------- -class RasterFreeDeformTool : public RasterDeformTool { +class RasterFreeDeformTool final : public RasterDeformTool { FreeDeform *m_freeDeform; public: @@ -149,7 +149,7 @@ public: // RasterMoveSelectionTool //----------------------------------------------------------------------------- -class RasterMoveSelectionTool : public RasterDeformTool { +class RasterMoveSelectionTool final : public RasterDeformTool { MoveSelection *m_moveSelection; public: @@ -163,7 +163,7 @@ public: // RasterScaleTool //----------------------------------------------------------------------------- -class RasterScaleTool : public RasterDeformTool { +class RasterScaleTool final : public RasterDeformTool { Scale *m_scale; public: @@ -180,7 +180,7 @@ public: // RasterSelectionTool //----------------------------------------------------------------------------- -class RasterSelectionTool : public SelectionTool { +class RasterSelectionTool final : public SelectionTool { Q_DECLARE_TR_FUNCTIONS(RasterSelectionTool) RasterSelection m_rasterSelection; diff --git a/toonz/sources/tnztools/rastertapetool.cpp b/toonz/sources/tnztools/rastertapetool.cpp index dda9322..0f927ce 100644 --- a/toonz/sources/tnztools/rastertapetool.cpp +++ b/toonz/sources/tnztools/rastertapetool.cpp @@ -58,7 +58,7 @@ public: //============================================================ -class RasterAutocloseUndo : public TRasterUndo { +class RasterAutocloseUndo final : public TRasterUndo { AutocloseParameters m_params; std::vector m_segments; @@ -100,7 +100,7 @@ public: //============================================================ -class RasterTapeTool : public TTool { +class RasterTapeTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(RasterTapeTool) bool m_selecting; diff --git a/toonz/sources/tnztools/rgbpickertool.cpp b/toonz/sources/tnztools/rgbpickertool.cpp index e5e7e27..2b3f1b9 100644 --- a/toonz/sources/tnztools/rgbpickertool.cpp +++ b/toonz/sources/tnztools/rgbpickertool.cpp @@ -45,7 +45,7 @@ namespace RGBPicker { // Pick RGB Tool //------------------------------------------------------------ -class UndoPickRGBM : public TUndo { +class UndoPickRGBM final : public TUndo { TPaletteP m_palette; int m_styleId; int m_styleParamIndex; @@ -198,7 +198,7 @@ RGBPickerTool::RGBPickerTool() , m_firstTime(true) , m_passivePick("Passive Pick", false) , m_toolOptionsBox(0) - , m_mousePixelPosition(){ + , m_mousePixelPosition() { bind(TTool::CommonLevels); m_prop.bind(m_pickType); m_pickType.addValue(NORMAL_PICK); @@ -284,8 +284,8 @@ void RGBPickerTool::draw() { ? TPixel32::White : TPixel32::Red; ToolUtils::drawRect(m_drawingRect, color, 0x3F33, true); - } - else if (m_pickType.getValue() == POLYLINE_PICK && !m_drawingPolyline.empty()) { + } else if (m_pickType.getValue() == POLYLINE_PICK && + !m_drawingPolyline.empty()) { TPixel color = ToonzCheck::instance()->getChecks() & ToonzCheck::eBlackBg ? TPixel32::White : TPixel32::Black; @@ -296,12 +296,11 @@ void RGBPickerTool::draw() { tglVertex(m_drawingPolyline[i]); tglVertex(m_mousePosition); glEnd(); - } - else if (m_pickType.getValue() == FREEHAND_PICK && !m_drawingTrack.isEmpty()) - { + } else if (m_pickType.getValue() == FREEHAND_PICK && + !m_drawingTrack.isEmpty()) { TPixel color = ToonzCheck::instance()->getChecks() & ToonzCheck::eBlackBg - ? TPixel32::White - : TPixel32::Black; + ? TPixel32::White + : TPixel32::Black; tglColor(color); m_drawingTrack.drawAllFragments(); } @@ -336,9 +335,9 @@ void RGBPickerTool::leftButtonDown(const TPointD &pos, const TMouseEvent &e) { } else if (m_pickType.getValue() == POLYLINE_PICK) { addPointPolyline(pos, convert(e.m_pos)); return; - } else {//NORMAL_PICK + } else { // NORMAL_PICK m_mousePixelPosition = e.m_pos; - m_makePick = true; + m_makePick = true; invalidate(); } } @@ -354,9 +353,7 @@ void RGBPickerTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { m_drawingRect.y1 = pos.y; invalidate(); return; - } - else if (m_pickType.getValue() == FREEHAND_PICK) - { + } else if (m_pickType.getValue() == FREEHAND_PICK) { freehandDrag(pos, convert(e.m_pos)); invalidate(); } @@ -372,8 +369,7 @@ void RGBPickerTool::leftButtonUp(const TPointD &pos, const TMouseEvent &) { } if (m_pickType.getValue() == FREEHAND_PICK) { closeFreehand(); - if (m_currentStyleId != 0) - m_makePick = true; + if (m_currentStyleId != 0) m_makePick = true; } invalidate(); } @@ -416,12 +412,11 @@ void RGBPickerTool::mouseMove(const TPointD &pos, const TMouseEvent &e) { //--------------------------------------------------------- -void RGBPickerTool::passivePick() -{ +void RGBPickerTool::passivePick() { TImageP image = TImageP(getImage(false)); if (!image) return; - TRectD area = TRectD(m_mousePixelPosition.x, m_mousePixelPosition.y, - m_mousePixelPosition.x, m_mousePixelPosition.y); + TRectD area = TRectD(m_mousePixelPosition.x, m_mousePixelPosition.y, + m_mousePixelPosition.x, m_mousePixelPosition.y); StylePicker picker(image); @@ -430,7 +425,7 @@ void RGBPickerTool::passivePick() QColor col((int)pix.r, (int)pix.g, (int)pix.b); PaletteController *controller = - TTool::getApplication()->getPaletteController(); + TTool::getApplication()->getPaletteController(); controller->notifyColorPassivePicked(col); } @@ -445,8 +440,8 @@ void RGBPickerTool::pick() { TPalette *palette = ph->getPalette(); if (!palette) return; - TRectD area = TRectD(m_mousePixelPosition.x - 1, m_mousePixelPosition.y - 1, - m_mousePixelPosition.x + 1, m_mousePixelPosition.y + 1); + TRectD area = TRectD(m_mousePixelPosition.x - 1, m_mousePixelPosition.y - 1, + m_mousePixelPosition.x + 1, m_mousePixelPosition.y + 1); StylePicker picker(image, palette); m_currentValue = picker.pickColor(area); @@ -489,9 +484,8 @@ void RGBPickerTool::pickRect() { m_selectingRect.empty(); if (area.getLx() <= 1 || area.getLy() <= 1) return; StylePicker picker(image, palette); - - m_currentValue = picker.pickColor(area); + m_currentValue = picker.pickColor(area); } //--------------------------------------------------------- @@ -507,9 +501,9 @@ void RGBPickerTool::pickStroke() { StylePicker picker(image, palette); TStroke *stroke = new TStroke(*m_stroke); - + m_currentValue = picker.pickColor(stroke); - + if (!(m_pickType.getValue() == POLYLINE_PICK)) { TXshSimpleLevel *level = app->getCurrentLevel()->getSimpleLevel(); TUndoManager::manager()->add( @@ -564,7 +558,8 @@ int RGBPickerTool::getCursorId() const { //--------------------------------------------------------- void RGBPickerTool::doPolylineFreehandPick() { - if (m_stroke && (m_pickType.getValue() == POLYLINE_PICK || m_pickType.getValue() == FREEHAND_PICK)) { + if (m_stroke && (m_pickType.getValue() == POLYLINE_PICK || + m_pickType.getValue() == FREEHAND_PICK)) { pickStroke(); delete m_stroke; m_stroke = 0; diff --git a/toonz/sources/tnztools/rgbpickertool.h b/toonz/sources/tnztools/rgbpickertool.h index 2c2072f..432778a 100644 --- a/toonz/sources/tnztools/rgbpickertool.h +++ b/toonz/sources/tnztools/rgbpickertool.h @@ -10,7 +10,7 @@ #include -class RGBPickerTool : public TTool { +class RGBPickerTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(RGBPickerTool) bool m_firstTime; diff --git a/toonz/sources/tnztools/rulertool.h b/toonz/sources/tnztools/rulertool.h index f8ffc97..c28c9d4 100644 --- a/toonz/sources/tnztools/rulertool.h +++ b/toonz/sources/tnztools/rulertool.h @@ -11,7 +11,7 @@ //---------------------------------------------------------------------------------------------- -class RulerTool : public TTool { +class RulerTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(RulerTool) enum DragMode { MakeNewRuler = 0, MoveFirstPos, MoveSecondPos, MoveRuler }; diff --git a/toonz/sources/tnztools/screenpicker.cpp b/toonz/sources/tnztools/screenpicker.cpp index 92733c2..efe7585 100644 --- a/toonz/sources/tnztools/screenpicker.cpp +++ b/toonz/sources/tnztools/screenpicker.cpp @@ -144,7 +144,7 @@ void ScreenPicker::startGrab() { // Pick Screen Command instantiation //*********************************************************************************** -class PickScreenCommandHandler : public MenuItemHandler { +class PickScreenCommandHandler final : public MenuItemHandler { public: PickScreenCommandHandler(CommandId cmdId) : MenuItemHandler(cmdId) {} void execute() override { diff --git a/toonz/sources/tnztools/selectiontool.cpp b/toonz/sources/tnztools/selectiontool.cpp index 782f9c6..d1758ba 100644 --- a/toonz/sources/tnztools/selectiontool.cpp +++ b/toonz/sources/tnztools/selectiontool.cpp @@ -299,7 +299,7 @@ namespace { // UndoMoveCenter //----------------------------------------------------------------------------- -class UndoMoveCenter : public TUndo { +class UndoMoveCenter final : public TUndo { SelectionTool *m_tool; TAffine m_aff; @@ -324,7 +324,7 @@ public: // MoveCenterTool //----------------------------------------------------------------------------- -class MoveCenterTool : public DragTool { +class MoveCenterTool final : public DragTool { TPointD m_startPos; TAffine m_transform; diff --git a/toonz/sources/tnztools/setsaveboxtool.cpp b/toonz/sources/tnztools/setsaveboxtool.cpp index 72cff66..0a1012c 100644 --- a/toonz/sources/tnztools/setsaveboxtool.cpp +++ b/toonz/sources/tnztools/setsaveboxtool.cpp @@ -19,7 +19,7 @@ using namespace ToolUtils; namespace { //----------------------------------------------------------------------------- -class SetSaveboxUndo : public TRasterUndo { +class SetSaveboxUndo final : public TRasterUndo { TRect m_modifiedSavebox; TRect m_originalSavebox; diff --git a/toonz/sources/tnztools/skeletonsubtools.cpp b/toonz/sources/tnztools/skeletonsubtools.cpp index 13f21b3..b6f3a90 100644 --- a/toonz/sources/tnztools/skeletonsubtools.cpp +++ b/toonz/sources/tnztools/skeletonsubtools.cpp @@ -585,7 +585,7 @@ bool addToActiveChain(Graph &tree, const Skeleton::Bone *bone, namespace SkeletonSubtools { -class IKToolUndo : public TUndo { +class IKToolUndo final : public TUndo { struct Node { TStageObjectId m_id; double m_oldAngle, m_newAngle; @@ -1053,7 +1053,7 @@ void IKTool::draw() { // //------------------------------------------------------------ -class ChangeDrawingUndo : public TUndo { +class ChangeDrawingUndo final : public TUndo { int m_row, m_col; TFrameId m_oldFid, m_newFid; diff --git a/toonz/sources/tnztools/skeletonsubtools.h b/toonz/sources/tnztools/skeletonsubtools.h index 27d2044..f071e6e 100644 --- a/toonz/sources/tnztools/skeletonsubtools.h +++ b/toonz/sources/tnztools/skeletonsubtools.h @@ -35,7 +35,7 @@ public: //--------------------------------------------------------- -class DragCenterTool : public DragTool { +class DragCenterTool final : public DragTool { TStageObjectId m_objId; int m_frame; @@ -84,7 +84,7 @@ public: //--------------------------------------------------------- -class DragPositionTool : public DragChannelTool { +class DragPositionTool final : public DragChannelTool { TPointD m_firstPos; public: @@ -96,7 +96,7 @@ public: //--------------------------------------------------------- -class DragRotationTool : public DragChannelTool { +class DragRotationTool final : public DragChannelTool { TPointD m_lastPos; TPointD m_center; bool m_snapped; @@ -110,7 +110,7 @@ public: //--------------------------------------------------------- -class ParentChangeTool : public DragTool { +class ParentChangeTool final : public DragTool { TTool::Viewer *m_viewer; TPoint m_firstWinPos; TPointD m_lastPos, m_lastPos2; @@ -154,7 +154,7 @@ public: class IKToolUndo; -class IKTool : public DragTool { +class IKTool final : public DragTool { TTool::Viewer *m_viewer; TPointD m_pos; Skeleton *m_skeleton; @@ -209,7 +209,7 @@ public: //--------------------------------------------------------- -class ChangeDrawingTool : public DragTool { +class ChangeDrawingTool final : public DragTool { int m_oldY; int m_dir; TUndo *m_undo; @@ -226,7 +226,7 @@ public: //--------------------------------------------------------- -class CommandHandler : public QObject { +class CommandHandler final : public QObject { Q_OBJECT Skeleton *m_skeleton; std::set *m_tempPinnedSet; diff --git a/toonz/sources/tnztools/skeletontool.cpp b/toonz/sources/tnztools/skeletontool.cpp index c993a05..0ce0e13 100644 --- a/toonz/sources/tnztools/skeletontool.cpp +++ b/toonz/sources/tnztools/skeletontool.cpp @@ -495,7 +495,7 @@ bool SkeletonTool::keyDown(int key, TUINT32 flags, const TPoint &pos) { //------------------------------------------------------------------- -class TogglePinnedStatusUndo : public TUndo { +class TogglePinnedStatusUndo final : public TUndo { SkeletonTool *m_tool; std::set m_oldTemp, m_newTemp; int m_columnIndex, m_oldColumnIndex; diff --git a/toonz/sources/tnztools/strokeselection.cpp b/toonz/sources/tnztools/strokeselection.cpp index 0ac11f8..c4efaef 100644 --- a/toonz/sources/tnztools/strokeselection.cpp +++ b/toonz/sources/tnztools/strokeselection.cpp @@ -171,7 +171,7 @@ void cutStrokesWithoutUndo(TVectorImageP image, std::set &indexes) { // CopyStrokesUndo //----------------------------------------------------------------------------- -class CopyStrokesUndo : public TUndo { +class CopyStrokesUndo final : public TUndo { QMimeData *m_oldData; QMimeData *m_newData; @@ -196,7 +196,7 @@ public: // PasteStrokesUndo //----------------------------------------------------------------------------- -class PasteStrokesUndo : public TUndo { +class PasteStrokesUndo final : public TUndo { TXshSimpleLevelP m_level; TFrameId m_frameId; std::set m_indexes; @@ -252,7 +252,7 @@ public: //-------------------------------------------------------------------- -class RemoveEndpointsUndo : public TUndo { +class RemoveEndpointsUndo final : public TUndo { TXshSimpleLevelP m_level; TFrameId m_frameId; std::vector> m_strokes; @@ -349,7 +349,7 @@ public: // CutStrokesUndo //----------------------------------------------------------------------------- -class CutStrokesUndo : public DeleteStrokesUndo { +class CutStrokesUndo final : public DeleteStrokesUndo { public: CutStrokesUndo(TXshSimpleLevel *level, const TFrameId &frameId, std::set indexes, QMimeData *data, @@ -619,7 +619,7 @@ void StrokeSelection::enableCommands() { namespace { //=================================================================== -class UndoSetStrokeStyle : public TUndo { +class UndoSetStrokeStyle final : public TUndo { TVectorImageP m_image; std::vector m_strokeIndexes; std::vector m_oldStyles; diff --git a/toonz/sources/tnztools/stylepickertool.cpp b/toonz/sources/tnztools/stylepickertool.cpp index 77000fd..e73625c 100644 --- a/toonz/sources/tnztools/stylepickertool.cpp +++ b/toonz/sources/tnztools/stylepickertool.cpp @@ -35,7 +35,7 @@ namespace { // Pick Style Tool //------------------------------------------------------------------------ -class StylePickerTool : public TTool { +class StylePickerTool final : public TTool { int m_oldStyleId, m_currentStyleId; TEnumProperty m_colorType; diff --git a/toonz/sources/tnztools/tool.cpp b/toonz/sources/tnztools/tool.cpp index c5516c0..a5bb9d5 100644 --- a/toonz/sources/tnztools/tool.cpp +++ b/toonz/sources/tnztools/tool.cpp @@ -59,7 +59,7 @@ std::set *toolNames = 0; // Local classes -struct DummyTool : public TTool { +struct DummyTool final : public TTool { ToolType getToolType() const override { return TTool::LevelReadTool; } // Test level type diff --git a/toonz/sources/tnztools/tooloptions.cpp b/toonz/sources/tnztools/tooloptions.cpp index 1a19bbe..ea777d3 100644 --- a/toonz/sources/tnztools/tooloptions.cpp +++ b/toonz/sources/tnztools/tooloptions.cpp @@ -580,9 +580,9 @@ ArrowToolOptionsBox::ArrowToolOptionsBox( if (splined != m_splined) m_splined = splined; setSplined(m_splined); - const int ITEM_SPACING = 10; + const int ITEM_SPACING = 10; const int LABEL_SPACING = 3; - + /* --- Layout --- */ /* --- Layout --- */ QHBoxLayout *mainLay = m_layout; { @@ -593,8 +593,8 @@ ArrowToolOptionsBox::ArrowToolOptionsBox( mainLay->addWidget(m_mainStackedWidget, 1); { - //Position - QFrame *posFrame = new QFrame(this); + // Position + QFrame *posFrame = new QFrame(this); QHBoxLayout *posLay = new QHBoxLayout(); posLay->setMargin(0); posLay->setSpacing(0); @@ -636,8 +636,8 @@ ArrowToolOptionsBox::ArrowToolOptionsBox( posLay->addStretch(1); } - //Rotation - QFrame *rotFrame = new QFrame(this); + // Rotation + QFrame *rotFrame = new QFrame(this); QHBoxLayout *rotLay = new QHBoxLayout(); rotLay->setMargin(0); rotLay->setSpacing(0); @@ -652,8 +652,8 @@ ArrowToolOptionsBox::ArrowToolOptionsBox( rotLay->addStretch(1); } - //Scale - QFrame *scaleFrame = new QFrame(this); + // Scale + QFrame *scaleFrame = new QFrame(this); QHBoxLayout *scaleLay = new QHBoxLayout(); scaleLay->setMargin(0); scaleLay->setSpacing(0); @@ -690,8 +690,8 @@ ArrowToolOptionsBox::ArrowToolOptionsBox( scaleLay->addStretch(1); } - //Shear - QFrame *shearFrame = new QFrame(this); + // Shear + QFrame *shearFrame = new QFrame(this); QHBoxLayout *shearLay = new QHBoxLayout(); shearLay->setMargin(0); shearLay->setSpacing(0); @@ -718,8 +718,8 @@ ArrowToolOptionsBox::ArrowToolOptionsBox( shearLay->addStretch(1); } - //Center Position - QFrame *centerPosFrame = new QFrame(this); + // Center Position + QFrame *centerPosFrame = new QFrame(this); QHBoxLayout *centerPosLay = new QHBoxLayout(); centerPosLay->setMargin(0); centerPosLay->setSpacing(0); @@ -981,12 +981,11 @@ void ArrowToolOptionsBox::onCurrentStageObjectComboActivated(int index) { //============================================================================= IconViewField::IconViewField(QWidget *parent, IconType iconType) - : QWidget(parent) - , m_iconType(iconType){ + : QWidget(parent), m_iconType(iconType) { setMinimumSize(21, 25); } -void IconViewField::paintEvent(QPaintEvent *e){ +void IconViewField::paintEvent(QPaintEvent *e) { QPainter p(this); // La pixmap e' alta 17 px, il widget 23. Per centrarla faccio il draw a 3 px. p.drawPixmap(QRect(0, 3, 21, 17), m_pm[m_iconType]); @@ -1004,46 +1003,47 @@ SelectionToolOptionsBox::SelectionToolOptionsBox(QWidget *parent, TTool *tool, TPropertyGroup *props = tool->getProperties(0); assert(props->getPropertyCount() > 0); - RasterSelectionTool *rasterSelectionTool = dynamic_cast(tool); + RasterSelectionTool *rasterSelectionTool = + dynamic_cast(tool); SelectionTool *selectionTool = dynamic_cast(tool); ToolOptionControlBuilder builder(this, tool, pltHandle, toolHandle); - if (tool && tool->getProperties(0)) - tool->getProperties(0)->accept(builder); + if (tool && tool->getProperties(0)) tool->getProperties(0)->accept(builder); - //Scale - IconViewField *iconView = new IconViewField(this, IconViewField::Icon_ScalePeg); + IconViewField *iconView = + new IconViewField(this, IconViewField::Icon_ScalePeg); m_scaleXLabel = new QLabel(tr("H:"), this); m_scaleXField = new SelectionScaleField(selectionTool, 0, "Scale X"); m_scaleYLabel = new QLabel(tr("V:"), this); m_scaleYField = new SelectionScaleField(selectionTool, 1, "Scale Y"); - m_scaleLink = new DVGui::CheckBox(tr("Link"), this); + m_scaleLink = new DVGui::CheckBox(tr("Link"), this); - //Rotation - IconViewField *rotIconView = new IconViewField(this, IconViewField::Icon_Rotation); + IconViewField *rotIconView = + new IconViewField(this, IconViewField::Icon_Rotation); m_rotationField = new SelectionRotationField(selectionTool, tr("Rotation")); - //Move - IconViewField *moveIconView = new IconViewField(this, IconViewField::Icon_Position); + IconViewField *moveIconView = + new IconViewField(this, IconViewField::Icon_Position); m_moveXLabel = new QLabel(tr("E/W:"), this); m_moveXField = new SelectionMoveField(selectionTool, 0, "Move X"); m_moveYLabel = addLabel(tr("N/S:")); m_moveYField = new SelectionMoveField(selectionTool, 1, "Move Y"); if (rasterSelectionTool) { - TBoolProperty *modifySetSaveboxProp = rasterSelectionTool->getModifySaveboxProperty(); + TBoolProperty *modifySetSaveboxProp = + rasterSelectionTool->getModifySaveboxProperty(); if (modifySetSaveboxProp) - m_setSaveboxCheckbox = new ToolOptionCheckbox(rasterSelectionTool, modifySetSaveboxProp); + m_setSaveboxCheckbox = + new ToolOptionCheckbox(rasterSelectionTool, modifySetSaveboxProp); } - m_scaleXLabel->setEnabled(false); m_scaleYLabel->setEnabled(false); m_moveXLabel->setEnabled(false); m_moveYLabel->setEnabled(false); - //--- layout ---- + //--- layout ---- addSeparator(); @@ -1067,24 +1067,25 @@ SelectionToolOptionsBox::SelectionToolOptionsBox(QWidget *parent, TTool *tool, hLayout()->addWidget(m_moveXField, 10); hLayout()->addWidget(m_moveYLabel, 0); hLayout()->addWidget(m_moveYField, 10); - if (m_setSaveboxCheckbox) - { + if (m_setSaveboxCheckbox) { addSeparator(); hLayout()->addWidget(m_setSaveboxCheckbox, 0); } - VectorSelectionTool *vectorSelectionTool = dynamic_cast(tool); + VectorSelectionTool *vectorSelectionTool = + dynamic_cast(tool); if (vectorSelectionTool) { m_isVectorSelction = true; - //change Thick - IconViewField *thicknessIconView = new IconViewField(this, IconViewField::Icon_Thickness); + // change Thick + IconViewField *thicknessIconView = + new IconViewField(this, IconViewField::Icon_Thickness); m_thickChangeField = new ThickChangeField(selectionTool, tr("Thickness")); addSeparator(); hLayout()->addWidget(thicknessIconView, 0); hLayout()->addWidget(m_thickChangeField, 10); - + // Outline options // Outline options ToolOptionControlBuilder builder(this, tool, pltHandle, toolHandle); builder.setEnumWidgetType(ToolOptionControlBuilder::POPUPBUTTON); @@ -1105,16 +1106,19 @@ SelectionToolOptionsBox::SelectionToolOptionsBox(QWidget *parent, TTool *tool, onPropertyChanged(); } - hLayout()->addStretch(1); - - bool ret = connect(m_scaleXField, SIGNAL(valueChange()), SLOT(onScaleXValueChanged())); - ret = ret && connect(m_scaleYField, SIGNAL(valueChange()), SLOT(onScaleYValueChanged())); - if (m_setSaveboxCheckbox) - ret = ret && connect(m_setSaveboxCheckbox, SIGNAL(toggled(bool)), SLOT(onSetSaveboxCheckboxChanged(bool))); + hLayout()->addStretch(1); + // assert(ret); + bool ret = connect(m_scaleXField, SIGNAL(valueChange()), + SLOT(onScaleXValueChanged())); + ret = ret && connect(m_scaleYField, SIGNAL(valueChange()), + SLOT(onScaleYValueChanged())); + if (m_setSaveboxCheckbox) + ret = ret && connect(m_setSaveboxCheckbox, SIGNAL(toggled(bool)), + SLOT(onSetSaveboxCheckboxChanged(bool))); - //assert(ret); + // assert(ret); - updateStatus(); + updateStatus(); } //----------------------------------------------------------------------------- @@ -1528,7 +1532,7 @@ void FillToolOptionsBox::onMultiFrameModeToggled(bool value) { // //============================================================================= -class BrushToolOptionsBox::PresetNamePopup : public DVGui::Dialog { +class BrushToolOptionsBox::PresetNamePopup final : public DVGui::Dialog { DVGui::LineEdit *m_nameFld; public: @@ -1791,7 +1795,7 @@ void EraserToolOptionsBox::onColorModeChanged() { // RulerToolOptionsBox // //============================================================================= -class ToolOptionsBarSeparator : public QWidget { +class ToolOptionsBarSeparator final : public QWidget { public: ToolOptionsBarSeparator(QWidget *parent) : QWidget(parent) { setFixedSize(2, 26); @@ -1954,7 +1958,7 @@ TapeToolOptionsBox::TapeToolOptionsBox(QWidget *parent, TTool *tool, ToolOptionControlBuilder builder(this, tool, pltHandle, toolHandle); if (tool && tool->getProperties(0)) tool->getProperties(0)->accept(builder); - + hLayout()->addStretch(1); if (!(tool->getTargetType() & TTool::Vectors)) return; @@ -2029,7 +2033,7 @@ void TapeToolOptionsBox::onJoinStrokesModeChanged() { //----------------------------------------------------------------------------- /*! Label with background color */ -class RGBLabel : public QWidget { +class RGBLabel final : public QWidget { QColor m_color; public: diff --git a/toonz/sources/tnztools/tooloptionscontrols.cpp b/toonz/sources/tnztools/tooloptionscontrols.cpp index 6857601..c3f1e52 100644 --- a/toonz/sources/tnztools/tooloptionscontrols.cpp +++ b/toonz/sources/tnztools/tooloptionscontrols.cpp @@ -135,14 +135,18 @@ ToolOptionSlider::ToolOptionSlider(TTool *tool, TDoubleProperty *property, TDoubleProperty::Range range = property->getRange(); setRange(range.first, range.second); - //calculate maximum text length which includes length for decimals (for now it's fixed to 2) and period - int textMaxLength = std::max(QString::number((int)range.first).length(), QString::number((int)range.second).length()) + m_lineEdit->getDecimals() + 1; + // calculate maximum text length which includes length for decimals (for now + // it's fixed to 2) and period + int textMaxLength = std::max(QString::number((int)range.first).length(), + QString::number((int)range.second).length()) + + m_lineEdit->getDecimals() + 1; QString txt; - //set the maximum width of the widget according to the text length (with 5 pixels margin) + // set the maximum width of the widget according to the text length (with 5 + // pixels margin) txt.fill('0', textMaxLength); int widgetWidth = fontMetrics().width(txt) + 5; m_lineEdit->parentWidget()->setMaximumWidth(widgetWidth); - //set the maximum width of the slider to 250 pixels + // set the maximum width of the slider to 250 pixels setMaximumWidth(250 + widgetWidth); updateStatus(); @@ -226,17 +230,21 @@ ToolOptionPairSlider::ToolOptionPairSlider(TTool *tool, TDoublePairProperty::Range range = property->getRange(); setRange(range.first, range.second); - //calculate maximum text length which includes length for decimals (for now it's fixed to 2) and period - int textMaxLength = std::max(QString::number((int)range.first).length(), QString::number((int)range.second).length()) + m_leftLineEdit->getDecimals() + 1; + // calculate maximum text length which includes length for decimals (for now + // it's fixed to 2) and period + int textMaxLength = std::max(QString::number((int)range.first).length(), + QString::number((int)range.second).length()) + + m_leftLineEdit->getDecimals() + 1; QString txt; - //set the maximum width of the widget according to the text length (with 5 pixels margin) + // set the maximum width of the widget according to the text length (with 5 + // pixels margin) txt.fill('0', textMaxLength); int widgetWidth = fontMetrics().width(txt) + 5; m_leftLineEdit->setFixedWidth(widgetWidth); m_rightLineEdit->setFixedWidth(widgetWidth); - m_leftMargin = widgetWidth + 12; + m_leftMargin = widgetWidth + 12; m_rightMargin = widgetWidth + 12; - //set the maximum width of the slider to 300 pixels + // set the maximum width of the slider to 300 pixels setMaximumWidth(300 + m_leftMargin + m_rightMargin); setLeftText(leftName); @@ -559,16 +567,15 @@ void ToolOptionCombo::loadEntries() { int maxWidth = 0; clear(); - for (it = range.begin(); it != range.end(); ++it) - { + for (it = range.begin(); it != range.end(); ++it) { QString itemStr = QString::fromStdWString(*it); addItem(itemStr); - int tmpWidth = fontMetrics().width(itemStr); - if (tmpWidth > maxWidth) - maxWidth = tmpWidth; + int tmpWidth = fontMetrics().width(itemStr); + if (tmpWidth > maxWidth) maxWidth = tmpWidth; } - //set the maximum width according to the longest item with 25 pixels for arrow button and margin + // set the maximum width according to the longest item with 25 pixels for + // arrow button and margin setMaximumWidth(maxWidth + 25); updateStatus(); @@ -857,7 +864,7 @@ void ToolOptionParamRelayField::onValueChanged() { //----------------------------------------------------------------------------- - struct SetValueUndo : public TUndo { + struct SetValueUndo final : public TUndo { TDoubleParamP m_param; //!< The referenced param double m_oldVal, m_newVal; //!< Values before and after the set action... double m_frame; //!< ... at this frame @@ -1026,12 +1033,12 @@ void MeasuredValueField::setPrecision(int precision) { //============================================================================= namespace { - //calculate maximum field size (once) with 10 pixels margin - int getMaximumWidthForEditToolField(QWidget* widget) { - static int fieldMaxWidth = widget->fontMetrics().width("-0000.00 field") + 10; - return fieldMaxWidth; - } -}//namespace +// calculate maximum field size (once) with 10 pixels margin +int getMaximumWidthForEditToolField(QWidget *widget) { + static int fieldMaxWidth = widget->fontMetrics().width("-0000.00 field") + 10; + return fieldMaxWidth; +} +} // namespace PegbarChannelField::PegbarChannelField(TTool *tool, enum TStageObject::Channel actionId, @@ -1081,7 +1088,7 @@ PegbarChannelField::PegbarChannelField(TTool *tool, } setMaximumWidth(getMaximumWidthForEditToolField(this)); - + updateStatus(); } @@ -1340,15 +1347,13 @@ void PropertyMenuButton::onActionTriggered(QAction *action) { } //============================================================================= -namespace -{ - //calculate maximum field size (once) with 10 pixels margin - int getMaximumWidthForSelectionToolField(QWidget* widget) - { - static int fieldMaxWidth = widget->fontMetrics().width("-000.00 %") + 10; - return fieldMaxWidth; - } -}//namespace +namespace { +// calculate maximum field size (once) with 10 pixels margin +int getMaximumWidthForSelectionToolField(QWidget *widget) { + static int fieldMaxWidth = widget->fontMetrics().width("-000.00 %") + 10; + return fieldMaxWidth; +} +} // namespace // id == 0 Scale X // id == 0 Scale Y @@ -1501,7 +1506,8 @@ SelectionMoveField::SelectionMoveField(SelectionTool *tool, int id, setMeasure("length.y"); updateStatus(); - // for translation value field, use size for the Edit Tool as it needs more estate + // for translation value field, use size for the Edit Tool as it needs more + // estate setMaximumWidth(getMaximumWidthForEditToolField(this)); } diff --git a/toonz/sources/tnztools/tooloptionscontrols.h b/toonz/sources/tnztools/tooloptionscontrols.h index 2eb1376..f3a26cd 100644 --- a/toonz/sources/tnztools/tooloptionscontrols.h +++ b/toonz/sources/tnztools/tooloptionscontrols.h @@ -81,7 +81,8 @@ public: // ToolOptionControl derivative declarations //*********************************************************************************** -class ToolOptionCheckbox : public DVGui::CheckBox, public ToolOptionControl { +class ToolOptionCheckbox final : public DVGui::CheckBox, + public ToolOptionControl { Q_OBJECT protected: @@ -100,7 +101,8 @@ protected: //----------------------------------------------------------------------------- -class ToolOptionSlider : public DVGui::DoubleField, public ToolOptionControl { +class ToolOptionSlider final : public DVGui::DoubleField, + public ToolOptionControl { Q_OBJECT protected: @@ -120,8 +122,8 @@ protected slots: //----------------------------------------------------------------------------- -class ToolOptionPairSlider : public DVGui::DoublePairField, - public ToolOptionControl { +class ToolOptionPairSlider final : public DVGui::DoublePairField, + public ToolOptionControl { Q_OBJECT protected: @@ -144,8 +146,8 @@ protected slots: //----------------------------------------------------------------------------- -class ToolOptionIntPairSlider : public DVGui::IntPairField, - public ToolOptionControl { +class ToolOptionIntPairSlider final : public DVGui::IntPairField, + public ToolOptionControl { Q_OBJECT protected: @@ -168,7 +170,8 @@ protected slots: //----------------------------------------------------------------------------- -class ToolOptionIntSlider : public DVGui::IntField, public ToolOptionControl { +class ToolOptionIntSlider final : public DVGui::IntField, + public ToolOptionControl { Q_OBJECT protected: @@ -188,7 +191,7 @@ protected slots: //----------------------------------------------------------------------------- -class ToolOptionCombo : public QComboBox, public ToolOptionControl { +class ToolOptionCombo final : public QComboBox, public ToolOptionControl { Q_OBJECT protected: @@ -209,7 +212,8 @@ public slots: //----------------------------------------------------------------------------- -class ToolOptionPopupButton : public PopupButton, public ToolOptionControl { +class ToolOptionPopupButton final : public PopupButton, + public ToolOptionControl { Q_OBJECT protected: @@ -230,7 +234,8 @@ public slots: //----------------------------------------------------------------------------- -class ToolOptionTextField : public DVGui::LineEdit, public ToolOptionControl { +class ToolOptionTextField final : public DVGui::LineEdit, + public ToolOptionControl { Q_OBJECT protected: @@ -247,8 +252,8 @@ public slots: //----------------------------------------------------------------------------- -class StyleIndexFieldAndChip : public DVGui::StyleIndexLineEdit, - public ToolOptionControl { +class StyleIndexFieldAndChip final : public DVGui::StyleIndexLineEdit, + public ToolOptionControl { Q_OBJECT protected: @@ -280,8 +285,8 @@ public slots: the edited one) \li Undo/Redo of user interactions. */ -class ToolOptionParamRelayField : public DVGui::MeasuredDoubleLineEdit, - public ToolOptionControl { +class ToolOptionParamRelayField final : public DVGui::MeasuredDoubleLineEdit, + public ToolOptionControl { Q_OBJECT TDoubleParamP m_param; //!< Cached property param @@ -356,7 +361,8 @@ signals: }; //----------------------------------------------------------------------------- -class PegbarChannelField : public MeasuredValueField, public ToolOptionControl { +class PegbarChannelField final : public MeasuredValueField, + public ToolOptionControl { Q_OBJECT const enum TStageObject::Channel m_actionId; @@ -386,8 +392,8 @@ protected slots: //----------------------------------------------------------------------------- -class DVAPI PegbarCenterField : public MeasuredValueField, - public ToolOptionControl { +class DVAPI PegbarCenterField final : public MeasuredValueField, + public ToolOptionControl { Q_OBJECT int m_index; // 0 = x, 1 = y @@ -410,7 +416,7 @@ protected slots: //----------------------------------------------------------------------------- -class NoScaleField : public MeasuredValueField, public ToolOptionControl { +class NoScaleField final : public MeasuredValueField, public ToolOptionControl { Q_OBJECT public: @@ -426,7 +432,7 @@ protected slots: //----------------------------------------------------------------------------- -class PropertyMenuButton : public QToolButton, public ToolOptionControl { +class PropertyMenuButton final : public QToolButton, public ToolOptionControl { Q_OBJECT QList m_properties; @@ -451,7 +457,7 @@ signals: //----------------------------------------------------------------------------- -class SelectionScaleField : public MeasuredValueField { +class SelectionScaleField final : public MeasuredValueField { Q_OBJECT int m_id; @@ -474,7 +480,7 @@ signals: //----------------------------------------------------------------------------- -class SelectionRotationField : public MeasuredValueField { +class SelectionRotationField final : public MeasuredValueField { Q_OBJECT SelectionTool *m_tool; @@ -492,7 +498,7 @@ protected slots: //----------------------------------------------------------------------------- -class SelectionMoveField : public MeasuredValueField { +class SelectionMoveField final : public MeasuredValueField { Q_OBJECT int m_id; @@ -511,7 +517,7 @@ protected slots: //----------------------------------------------------------------------------- -class ThickChangeField : public MeasuredValueField { +class ThickChangeField final : public MeasuredValueField { Q_OBJECT SelectionTool *m_tool; diff --git a/toonz/sources/tnztools/trackertool.cpp b/toonz/sources/tnztools/trackertool.cpp index 0ef5045..7813b24 100644 --- a/toonz/sources/tnztools/trackertool.cpp +++ b/toonz/sources/tnztools/trackertool.cpp @@ -47,7 +47,7 @@ namespace { //----------------------------------------------------------------------------- // Ancora da definire. // under construction -class TrackerRegionSelection : public TSelection { +class TrackerRegionSelection final : public TSelection { TXshLevelP m_level; std::set> m_objtp; // objtp: 1=ObjectId 2=Tracker Region Index @@ -138,7 +138,7 @@ return TDataP(); */ // TrackerTool class declaration //----------------------------------------------------------------------------- -class TrackerTool : public TTool { +class TrackerTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(TrackerTool) TrackerRegionSelection m_selection; diff --git a/toonz/sources/tnztools/typetool.cpp b/toonz/sources/tnztools/typetool.cpp index c8eca3e..8aa6701 100644 --- a/toonz/sources/tnztools/typetool.cpp +++ b/toonz/sources/tnztools/typetool.cpp @@ -92,7 +92,7 @@ const double cBorderSize = 15; // //--------------------------------------------------------- -class UndoTypeTool : public ToolUtils::TToolUndo { +class UndoTypeTool final : public ToolUtils::TToolUndo { std::vector m_strokes; std::vector *m_fillInformationBefore, *m_fillInformationAfter; @@ -193,7 +193,7 @@ public: //--------------------------------------------------------- -class RasterUndoTypeTool : public TRasterUndo { +class RasterUndoTypeTool final : public TRasterUndo { TTileSetCM32 *m_afterTiles; public: @@ -288,7 +288,7 @@ public: // //--------------------------------------------------------- -class TypeTool : public TTool { +class TypeTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(TypeTool) // Properties diff --git a/toonz/sources/tnztools/vectorerasertool.cpp b/toonz/sources/tnztools/vectorerasertool.cpp index c56035c..18d7502 100644 --- a/toonz/sources/tnztools/vectorerasertool.cpp +++ b/toonz/sources/tnztools/vectorerasertool.cpp @@ -72,7 +72,7 @@ void mapToVector(const std::map &theMap, //----------------------------------------------------------------------------- -class UndoEraser : public ToolUtils::TToolUndo { +class UndoEraser final : public ToolUtils::TToolUndo { std::vector m_oldFillInformation, m_newFillInformation; int m_row; @@ -247,7 +247,7 @@ public: // EraserTool class declaration //----------------------------------------------------------------------------- -class EraserTool : public TTool { +class EraserTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(EraserTool) public: diff --git a/toonz/sources/tnztools/vectorselectiontool.cpp b/toonz/sources/tnztools/vectorselectiontool.cpp index eaa99bb..18dc880 100644 --- a/toonz/sources/tnztools/vectorselectiontool.cpp +++ b/toonz/sources/tnztools/vectorselectiontool.cpp @@ -424,7 +424,7 @@ int DragSelectionTool::UndoChangeStrokes::getSize() const { // UndoChangeOutlineStyle //----------------------------------------------------------------------------- -class UndoChangeOutlineStyle : public ToolUtils::TToolUndo { +class UndoChangeOutlineStyle final : public ToolUtils::TToolUndo { std::vector m_oldOptions, m_newOptions; FourPoints m_oldBBox, m_newBBox; VectorSelectionTool *m_tool; @@ -1123,7 +1123,7 @@ bool getGroupBBox(const TVectorImage &vi, int strokeIndex, TRectD &gBox) { // UndoEnterGroup //----------------------------------------------------------------------------- -class UndoEnterGroup : public TUndo { +class UndoEnterGroup final : public TUndo { int m_strokeIndex; TVectorImageP m_vi; @@ -1145,7 +1145,7 @@ public: // UndoExitGroup //----------------------------------------------------------------------------- -class UndoExitGroup : public TUndo { +class UndoExitGroup final : public TUndo { int m_strokeIndex; TVectorImageP m_vi; diff --git a/toonz/sources/tnztools/vectorselectiontool.h b/toonz/sources/tnztools/vectorselectiontool.h index 60ee74e..6329157 100644 --- a/toonz/sources/tnztools/vectorselectiontool.h +++ b/toonz/sources/tnztools/vectorselectiontool.h @@ -65,7 +65,7 @@ enum SelectionTarget //! Possible selection targets in a SelectionTool. // VectorFreeDeformer //----------------------------------------------------------------------------- -class VectorFreeDeformer : public FreeDeformer { +class VectorFreeDeformer final : public FreeDeformer { TVectorImageP m_vi; std::set m_strokeIndexes; std::vector m_originalStrokes; @@ -106,7 +106,7 @@ namespace DragSelectionTool { // UndoChangeStrokes //----------------------------------------------------------------------------- -class UndoChangeStrokes : public ToolUtils::TToolUndo { +class UndoChangeStrokes final : public ToolUtils::TToolUndo { public: UndoChangeStrokes(TXshSimpleLevel *level, const TFrameId &frameId, VectorSelectionTool *tool, @@ -178,7 +178,7 @@ private: // VectorRotationTool //----------------------------------------------------------------------------- -class VectorRotationTool : public VectorDeformTool { +class VectorRotationTool final : public VectorDeformTool { tcg::unique_ptr m_rotation; public: @@ -193,7 +193,7 @@ public: // VectorFreeDeformTool //----------------------------------------------------------------------------- -class VectorFreeDeformTool : public VectorDeformTool { +class VectorFreeDeformTool final : public VectorDeformTool { tcg::unique_ptr m_freeDeform; public: @@ -206,7 +206,7 @@ public: // VectorMoveSelectionTool //----------------------------------------------------------------------------- -class VectorMoveSelectionTool : public VectorDeformTool { +class VectorMoveSelectionTool final : public VectorDeformTool { tcg::unique_ptr m_moveSelection; public: @@ -221,7 +221,7 @@ public: // VectorScaleTool //----------------------------------------------------------------------------- -class VectorScaleTool : public VectorDeformTool { +class VectorScaleTool final : public VectorDeformTool { tcg::unique_ptr m_scale; public: @@ -238,7 +238,7 @@ public: // VectorChangeThicknessTool //----------------------------------------------------------------------------- -class VectorChangeThicknessTool : public DragTool { +class VectorChangeThicknessTool final : public DragTool { TPointD m_curPos, m_firstPos; std::map> m_strokesThickness; double m_thicknessChange; @@ -271,7 +271,7 @@ public: \brief Selection tool for Toonz's vector images. */ -class VectorSelectionTool : public SelectionTool { +class VectorSelectionTool final : public SelectionTool { Q_DECLARE_TR_FUNCTIONS(VectorSelectionTool) public: @@ -327,7 +327,7 @@ protected: void onImageChanged() override; private: - class AttachedLevelSelection : public LevelSelection { + class AttachedLevelSelection final : public LevelSelection { StrokeSelection &m_strokeSelection; //!< Selection of strokes to be seen at //! current frame. diff --git a/toonz/sources/tnztools/vectortapetool.cpp b/toonz/sources/tnztools/vectortapetool.cpp index 39aff8b..332eab2 100644 --- a/toonz/sources/tnztools/vectortapetool.cpp +++ b/toonz/sources/tnztools/vectortapetool.cpp @@ -39,7 +39,7 @@ TEnv::StringVar TapeType("InknpaintTapeType1", "Normal"); TEnv::DoubleVar AutocloseFactor("InknpaintAutocloseFactor", 4.0); namespace { -class UndoAutoclose : public ToolUtils::TToolUndo { +class UndoAutoclose final : public ToolUtils::TToolUndo { int m_oldStrokeId1; int m_oldStrokeId2; int m_pos1, m_pos2; @@ -173,7 +173,7 @@ public: // Autoclose Tool //----------------------------------------------------------------------------- -class VectorTapeTool : public TTool { +class VectorTapeTool final : public TTool { Q_DECLARE_TR_FUNCTIONS(VectorTapeTool) bool m_draw; diff --git a/toonz/sources/tnztools/viewtools.cpp b/toonz/sources/tnztools/viewtools.cpp index a0ef448..39cf43c 100644 --- a/toonz/sources/tnztools/viewtools.cpp +++ b/toonz/sources/tnztools/viewtools.cpp @@ -16,7 +16,7 @@ namespace { // Zoom Tool //----------------------------------------------------------------------------- -class ZoomTool : public TTool { +class ZoomTool final : public TTool { int m_oldY; TPointD m_center; bool m_dragging; @@ -89,7 +89,7 @@ public: // Hand Tool //----------------------------------------------------------------------------- -class HandTool : public TTool { +class HandTool final : public TTool { TStopWatch m_sw; TPoint m_oldPos; @@ -130,7 +130,7 @@ public: // Rotate Tool //----------------------------------------------------------------------------- -class RotateTool : public TTool { +class RotateTool final : public TTool { TStopWatch m_sw; TPointD m_oldPos; TPointD m_center; diff --git a/toonz/sources/toonz/addfilmstripframespopup.h b/toonz/sources/toonz/addfilmstripframespopup.h index 254f251..d4bc179 100644 --- a/toonz/sources/toonz/addfilmstripframespopup.h +++ b/toonz/sources/toonz/addfilmstripframespopup.h @@ -14,7 +14,7 @@ class QLineEdit; // AddFilmstripFramesPopup //----------------------------------------------------------------------------- -class AddFilmstripFramesPopup : public DVGui::Dialog { +class AddFilmstripFramesPopup final : public DVGui::Dialog { Q_OBJECT QPushButton *m_okBtn; diff --git a/toonz/sources/toonz/adjustlevelspopup.cpp b/toonz/sources/toonz/adjustlevelspopup.cpp index ba7c5d7..919936d 100644 --- a/toonz/sources/toonz/adjustlevelspopup.cpp +++ b/toonz/sources/toonz/adjustlevelspopup.cpp @@ -92,7 +92,7 @@ void getRange(const QVector &values, int threshold, int &min, int &max) { // Adjust Levels Swatch //************************************************************************** -class AdjustLevelsPopup::Swatch : public PlaneViewer { +class AdjustLevelsPopup::Swatch final : public PlaneViewer { TRasterP m_ras; public: @@ -554,7 +554,7 @@ void AdjustLevelsPopup::autoAdjust() { // TGBMScale Undo //************************************************************************** -class AdjustLevelsUndo : public TUndo { +class AdjustLevelsUndo final : public TUndo { int m_in0[5], m_in1[5], m_out0[5], m_out1[5]; int m_r, m_c; diff --git a/toonz/sources/toonz/adjustlevelspopup.h b/toonz/sources/toonz/adjustlevelspopup.h index 2a3f050..69b6481 100644 --- a/toonz/sources/toonz/adjustlevelspopup.h +++ b/toonz/sources/toonz/adjustlevelspopup.h @@ -24,7 +24,7 @@ class QPushButton; // EditableMarksBar declaration //************************************************************** -class EditableMarksBar : public QFrame { +class EditableMarksBar final : public QFrame { Q_OBJECT MarksBar *m_marksBar; @@ -59,7 +59,7 @@ public slots: // Adjust-Levels Popup declaration //************************************************************** -class AdjustLevelsPopup : public DVGui::Dialog { +class AdjustLevelsPopup final : public DVGui::Dialog { Q_OBJECT Histogram *m_histogram; diff --git a/toonz/sources/toonz/adjustthicknesspopup.cpp b/toonz/sources/toonz/adjustthicknesspopup.cpp index aca6f9c..c1b3fdb 100644 --- a/toonz/sources/toonz/adjustthicknesspopup.cpp +++ b/toonz/sources/toonz/adjustthicknesspopup.cpp @@ -215,7 +215,7 @@ double relativePosition(int start, int end, int pos) { // Adjust Thickness Swatch //************************************************************************** -class AdjustThicknessPopup::Swatch : public PlaneViewer { +class AdjustThicknessPopup::Swatch final : public PlaneViewer { TVectorImageP m_vi; public: @@ -972,7 +972,7 @@ void AdjustThicknessPopup::updatePreview() { namespace { -class AdjustThicknessUndo : public TUndo { +class AdjustThicknessUndo final : public TUndo { public: AdjustThicknessUndo(const SelectionData &selData, double (&fromTransform)[2], double (&toTransform)[2]); diff --git a/toonz/sources/toonz/adjustthicknesspopup.h b/toonz/sources/toonz/adjustthicknesspopup.h index f064a02..edaa239 100644 --- a/toonz/sources/toonz/adjustthicknesspopup.h +++ b/toonz/sources/toonz/adjustthicknesspopup.h @@ -35,7 +35,7 @@ class QComboBox; // Adjust Thickness Popup declaration //***************************************************************************** -class AdjustThicknessPopup : public DVGui::Dialog { +class AdjustThicknessPopup final : public DVGui::Dialog { Q_OBJECT public: diff --git a/toonz/sources/toonz/antialiaspopup.cpp b/toonz/sources/toonz/antialiaspopup.cpp index db74fd8..58f1c48 100644 --- a/toonz/sources/toonz/antialiaspopup.cpp +++ b/toonz/sources/toonz/antialiaspopup.cpp @@ -69,7 +69,7 @@ inline void onChange(const TRasterP &ras, int threshold, int softness) { // AntialiasPopup Swatch //************************************************************************** -class AntialiasPopup::Swatch : public PlaneViewer { +class AntialiasPopup::Swatch final : public PlaneViewer { TImageP m_img; public: @@ -274,7 +274,7 @@ void AntialiasPopup::hideEvent(QHideEvent *he) { //----------------------------------------------------------------------------- -class TRasterAntialiasUndo : public TUndo { +class TRasterAntialiasUndo final : public TUndo { int m_r, m_c, m_threshold, m_softness; QString m_rasId; diff --git a/toonz/sources/toonz/antialiaspopup.h b/toonz/sources/toonz/antialiaspopup.h index 197d081..ea3559f 100644 --- a/toonz/sources/toonz/antialiaspopup.h +++ b/toonz/sources/toonz/antialiaspopup.h @@ -16,7 +16,7 @@ class IntField; // AntialiasPopup //----------------------------------------------------------------------------- -class AntialiasPopup : public DVGui::Dialog { +class AntialiasPopup final : public DVGui::Dialog { Q_OBJECT DVGui::IntField *m_thresholdField; diff --git a/toonz/sources/toonz/batches.cpp b/toonz/sources/toonz/batches.cpp index a12154f..2931947 100644 --- a/toonz/sources/toonz/batches.cpp +++ b/toonz/sources/toonz/batches.cpp @@ -30,7 +30,7 @@ namespace { -class NotifyMessage : public TThread::Message { +class NotifyMessage final : public TThread::Message { public: NotifyMessage() {} @@ -137,7 +137,7 @@ bool SaveTaskListPopup::execute() { QMutex TasksMutex; map RunningTasks; -class TaskRunner : public TThread::Runnable { +class TaskRunner final : public TThread::Runnable { public: TaskRunner(TFarmTask *task, int localControllerPort) : m_task(task), m_localControllerPort(localControllerPort) {} @@ -953,7 +953,7 @@ TFarmController *BatchesController::getController() const { namespace { -class ControllerFailureMsg : public TThread::Message { +class ControllerFailureMsg final : public TThread::Message { public: ControllerFailureMsg(const TException &e) : m_e(e) {} @@ -1027,7 +1027,7 @@ BatchesController::Observer::~Observer() {} namespace { -class MyLocalController : public TFarmController, public TFarmExecutor { +class MyLocalController final : public TFarmController, public TFarmExecutor { public: MyLocalController(int port) : TFarmExecutor(port) {} @@ -1173,7 +1173,7 @@ void MyLocalController::taskProgress(const QString &taskId, int step, void MyLocalController::taskCompleted(const QString &taskId, int exitCode) {} -class MyLocalControllerController : public TThread::Runnable { +class MyLocalControllerController final : public TThread::Runnable { MyLocalController *m_controller; public: diff --git a/toonz/sources/toonz/batches.h b/toonz/sources/toonz/batches.h index e8fdb8b..c6d6b3e 100644 --- a/toonz/sources/toonz/batches.h +++ b/toonz/sources/toonz/batches.h @@ -28,7 +28,7 @@ class TFarmController; //------------------------------------------------------------------------------ class TaskTreeModel; -class BatchesController : public QObject { // singleton +class BatchesController final : public QObject { // singleton Q_OBJECT public: static BatchesController *instance(); @@ -109,7 +109,7 @@ private: static inline QString taskBusyStr(); }; //----------------------------------------------------------------------------- -class LoadTaskListPopup : public FileBrowserPopup { +class LoadTaskListPopup final : public FileBrowserPopup { public: LoadTaskListPopup(); @@ -118,7 +118,7 @@ public: //----------------------------------------------------------------------------- -class LoadTaskPopup : public FileBrowserPopup { +class LoadTaskPopup final : public FileBrowserPopup { Q_OBJECT bool m_isRenderTask; @@ -132,7 +132,7 @@ public: //----------------------------------------------------------------------------- -class SaveTaskListPopup : public FileBrowserPopup { +class SaveTaskListPopup final : public FileBrowserPopup { Q_OBJECT public: diff --git a/toonz/sources/toonz/batchserversviewer.cpp b/toonz/sources/toonz/batchserversviewer.cpp index 8371855..3fafa20 100644 --- a/toonz/sources/toonz/batchserversviewer.cpp +++ b/toonz/sources/toonz/batchserversviewer.cpp @@ -21,7 +21,7 @@ using namespace TFarmStuff; //------------------------------------------------------------------------------ -class MyListItem : public QListWidgetItem { +class MyListItem final : public QListWidgetItem { public: QString m_id; diff --git a/toonz/sources/toonz/batchserversviewer.h b/toonz/sources/toonz/batchserversviewer.h index b91e71a..a28eaf2 100644 --- a/toonz/sources/toonz/batchserversviewer.h +++ b/toonz/sources/toonz/batchserversviewer.h @@ -20,7 +20,7 @@ class QListWidgetItem; //============================================================================= // BatchServersViewer -class FarmServerListView : public QListWidget { +class FarmServerListView final : public QListWidget { Q_OBJECT public: FarmServerListView(QWidget *parent); @@ -40,7 +40,7 @@ private: std::unique_ptr m_menu; }; -class BatchServersViewer : public QFrame { +class BatchServersViewer final : public QFrame { Q_OBJECT public: diff --git a/toonz/sources/toonz/binarizepopup.cpp b/toonz/sources/toonz/binarizepopup.cpp index d07c976..25f30f2 100644 --- a/toonz/sources/toonz/binarizepopup.cpp +++ b/toonz/sources/toonz/binarizepopup.cpp @@ -53,7 +53,7 @@ // TBinarizeUndo //************************************************************************** -class TBinarizeUndo : public TUndo { +class TBinarizeUndo final : public TUndo { std::wstring m_levelName; TFrameId m_fid; bool m_alphaEnabled; @@ -124,7 +124,7 @@ public: // BinarizePopup Swatch //************************************************************************** -class BinarizePopup::Swatch : public PlaneViewer { +class BinarizePopup::Swatch final : public PlaneViewer { TRasterP m_ras; public: diff --git a/toonz/sources/toonz/binarizepopup.h b/toonz/sources/toonz/binarizepopup.h index 56b9bf9..cc58024 100644 --- a/toonz/sources/toonz/binarizepopup.h +++ b/toonz/sources/toonz/binarizepopup.h @@ -21,7 +21,7 @@ class CheckBox; // BinarizePopup //----------------------------------------------------------------------------- -class BinarizePopup : public DVGui::Dialog { +class BinarizePopup final : public DVGui::Dialog { Q_OBJECT protected: diff --git a/toonz/sources/toonz/brightnessandcontrastpopup.cpp b/toonz/sources/toonz/brightnessandcontrastpopup.cpp index 59147b0..4c9ea89 100644 --- a/toonz/sources/toonz/brightnessandcontrastpopup.cpp +++ b/toonz/sources/toonz/brightnessandcontrastpopup.cpp @@ -197,7 +197,7 @@ inline void onChange(const RAS &ras, int contrast, int brightness) { // BrightnessAndContrastPopup Swatch //************************************************************************** -class BrightnessAndContrastPopup::Swatch : public PlaneViewer { +class BrightnessAndContrastPopup::Swatch final : public PlaneViewer { TRasterP m_ras; public: @@ -402,7 +402,7 @@ void BrightnessAndContrastPopup::hideEvent(QHideEvent *he) { //----------------------------------------------------------------------------- -class TRasterBrightnessUndo : public TUndo { +class TRasterBrightnessUndo final : public TUndo { int m_r, m_c, m_brightness, m_contrast; QString m_rasId; diff --git a/toonz/sources/toonz/brightnessandcontrastpopup.h b/toonz/sources/toonz/brightnessandcontrastpopup.h index d811942..982108d 100644 --- a/toonz/sources/toonz/brightnessandcontrastpopup.h +++ b/toonz/sources/toonz/brightnessandcontrastpopup.h @@ -19,7 +19,7 @@ class IntField; // BrightnessAndContrastPopup //----------------------------------------------------------------------------- -class BrightnessAndContrastPopup : public DVGui::Dialog { +class BrightnessAndContrastPopup final : public DVGui::Dialog { Q_OBJECT DVGui::IntField *m_brightnessField; diff --git a/toonz/sources/toonz/cachefxcommand.h b/toonz/sources/toonz/cachefxcommand.h index 90e1e9b..2a1bb71 100644 --- a/toonz/sources/toonz/cachefxcommand.h +++ b/toonz/sources/toonz/cachefxcommand.h @@ -11,7 +11,7 @@ // CacheFxCommand //----------------------------------------------------------------------------- -class CacheFxCommand : public QObject { +class CacheFxCommand final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/toonz/camerasettingspopup.cpp b/toonz/sources/toonz/camerasettingspopup.cpp index 2a3beab..8735cc3 100644 --- a/toonz/sources/toonz/camerasettingspopup.cpp +++ b/toonz/sources/toonz/camerasettingspopup.cpp @@ -55,7 +55,7 @@ class CameraSettingsPopup; //============================================================================= -class OpenCameraStageCommandHandler : public MenuItemHandler { +class OpenCameraStageCommandHandler final : public MenuItemHandler { CommandId m_id; public: diff --git a/toonz/sources/toonz/camerasettingspopup.h b/toonz/sources/toonz/camerasettingspopup.h index 052351e..13505be 100644 --- a/toonz/sources/toonz/camerasettingspopup.h +++ b/toonz/sources/toonz/camerasettingspopup.h @@ -30,7 +30,7 @@ class MeasuredDoubleLineEdit; // CameraSettingsPopup //----------------------------------------------------------------------------- -class CameraSettingsPopup : public QDialog { +class CameraSettingsPopup final : public QDialog { Q_OBJECT static std::map m_popups; diff --git a/toonz/sources/toonz/canvassizepopup.cpp b/toonz/sources/toonz/canvassizepopup.cpp index 0bed09e..ac940c9 100644 --- a/toonz/sources/toonz/canvassizepopup.cpp +++ b/toonz/sources/toonz/canvassizepopup.cpp @@ -39,7 +39,7 @@ namespace { -class ResizeCanvasUndo : public TUndo { +class ResizeCanvasUndo final : public TUndo { TXshSimpleLevelP m_level; TFrameId m_fid; std::string m_oldImageId, m_newImageId; diff --git a/toonz/sources/toonz/canvassizepopup.h b/toonz/sources/toonz/canvassizepopup.h index 3953e4e..d8ce737 100644 --- a/toonz/sources/toonz/canvassizepopup.h +++ b/toonz/sources/toonz/canvassizepopup.h @@ -23,7 +23,7 @@ enum PeggingPositions { e00, e01, e02, e10, e11, e12, e20, e21, e22 }; //============================================================================= -class PeggingWidget : public QWidget { +class PeggingWidget final : public QWidget { Q_OBJECT QButtonGroup *m_buttonGroup; @@ -66,7 +66,7 @@ public slots: // CanvasSizePopup //----------------------------------------------------------------------------- -class CanvasSizePopup : public DVGui::Dialog { +class CanvasSizePopup final : public DVGui::Dialog { Q_OBJECT TXshSimpleLevelP m_sl; diff --git a/toonz/sources/toonz/castselection.h b/toonz/sources/toonz/castselection.h index c966246..cf399c7 100644 --- a/toonz/sources/toonz/castselection.h +++ b/toonz/sources/toonz/castselection.h @@ -17,7 +17,7 @@ class TXshLevel; // //----------------------------------------------------------------------------- -class CastSelection : public DvItemSelection { +class CastSelection final : public DvItemSelection { CastBrowser *m_browser; public: @@ -58,7 +58,7 @@ public: }; //----------------------------------------------------------------------------- -class LevelCastItem : public CastItem { +class LevelCastItem final : public CastItem { TXshLevel *m_level; QSize m_itemPixmapSize; @@ -78,7 +78,7 @@ public: }; //----------------------------------------------------------------------------- -class SoundCastItem : public CastItem { +class SoundCastItem final : public CastItem { TXshSoundLevel *m_soundLevel; QSize m_itemPixmapSize; @@ -98,7 +98,7 @@ public: //----------------------------------------------------------------------------- -class PaletteCastItem : public CastItem { +class PaletteCastItem final : public CastItem { TXshPaletteLevel *m_paletteLevel; QSize m_itemPixmapSize; @@ -117,7 +117,7 @@ public: }; //----------------------------------------------------------------------------- -class CastItems : public QMimeData { +class CastItems final : public QMimeData { std::vector m_items; public: diff --git a/toonz/sources/toonz/castviewer.cpp b/toonz/sources/toonz/castviewer.cpp index de46de5..5cc3aab 100644 --- a/toonz/sources/toonz/castviewer.cpp +++ b/toonz/sources/toonz/castviewer.cpp @@ -60,7 +60,7 @@ namespace { // dipendere dallo sceneHandle) // questo undo puo' essere spostato in un nuovo file levelsetcommand in // toonzlib. -class MoveLevelToFolderUndo : public TUndo { +class MoveLevelToFolderUndo final : public TUndo { TLevelSet *m_levelSet; std::wstring m_levelName; TFilePath m_oldFolder; diff --git a/toonz/sources/toonz/castviewer.h b/toonz/sources/toonz/castviewer.h index f5496ff..b39b939 100644 --- a/toonz/sources/toonz/castviewer.h +++ b/toonz/sources/toonz/castviewer.h @@ -17,7 +17,7 @@ class CastItems; //----------------------------------------------------------------------------- -class CastTreeViewer : public QTreeWidget, public TSelection { +class CastTreeViewer final : public QTreeWidget, public TSelection { Q_OBJECT QTreeWidgetItem *m_dropTargetItem; TFilePath m_dropFilePath; @@ -68,7 +68,7 @@ signals: m_treeView e un widget che consente di visualizzare i file \b m_sceneCastView. I suoi widget sono settati tramite un modello del tipo \b SceneCastModel.*/ -class CastBrowser : public QSplitter, public DvItemListModel { +class CastBrowser final : public QSplitter, public DvItemListModel { Q_OBJECT CastTreeViewer *m_treeViewer; diff --git a/toonz/sources/toonz/celldata.h b/toonz/sources/toonz/celldata.h index 4d3536a..f8a9b0f 100644 --- a/toonz/sources/toonz/celldata.h +++ b/toonz/sources/toonz/celldata.h @@ -17,7 +17,7 @@ class TXshColumn; // TCellData //----------------------------------------------------------------------------- -class TCellData : public DvMimeData { +class TCellData final : public DvMimeData { std::vector m_cells; int m_rowCount, m_colCount; diff --git a/toonz/sources/toonz/cellkeyframedata.h b/toonz/sources/toonz/cellkeyframedata.h index f0ca1dd..baf3327 100644 --- a/toonz/sources/toonz/cellkeyframedata.h +++ b/toonz/sources/toonz/cellkeyframedata.h @@ -15,7 +15,7 @@ class TXshColumn; // TCellKeyframeData //----------------------------------------------------------------------------- -class TCellKeyframeData : public DvMimeData { +class TCellKeyframeData final : public DvMimeData { TCellData *m_cellData; TKeyframeData *m_keyframeData; diff --git a/toonz/sources/toonz/cellkeyframeselection.h b/toonz/sources/toonz/cellkeyframeselection.h index 3a17caf..20768ba 100644 --- a/toonz/sources/toonz/cellkeyframeselection.h +++ b/toonz/sources/toonz/cellkeyframeselection.h @@ -15,7 +15,7 @@ class TXsheetHandle; // TCellKeyframeSelection //----------------------------------------------------------------------------- -class TCellKeyframeSelection : public TSelection { +class TCellKeyframeSelection final : public TSelection { TCellSelection *m_cellSelection; TKeyframeSelection *m_keyframeSelection; diff --git a/toonz/sources/toonz/cellselection.cpp b/toonz/sources/toonz/cellselection.cpp index 3f1b752..4507885 100644 --- a/toonz/sources/toonz/cellselection.cpp +++ b/toonz/sources/toonz/cellselection.cpp @@ -156,7 +156,7 @@ void cutCellsWithoutUndo(int &r0, int &c0, int &r1, int &c1) { // PasteCellsUndo //----------------------------------------------------------------------------- -class PasteCellsUndo : public TUndo { +class PasteCellsUndo final : public TUndo { TCellSelection *m_oldSelection; TCellSelection *m_newSelection; TCellData *m_data; @@ -223,7 +223,7 @@ public: // DeleteCellsUndo //----------------------------------------------------------------------------- -class DeleteCellsUndo : public TUndo { +class DeleteCellsUndo final : public TUndo { TCellSelection *m_selection; QMimeData *m_data; QMap> m_outputConnections; @@ -311,7 +311,7 @@ public: // CutCellsUndo //----------------------------------------------------------------------------- -class CutCellsUndo : public TUndo { +class CutCellsUndo final : public TUndo { TCellSelection *m_selection; TCellData *m_data; QMap> m_outputConnections; @@ -389,7 +389,7 @@ public: // InsertUndo //----------------------------------------------------------------------------- -class InsertUndo : public TUndo { +class InsertUndo final : public TUndo { TCellSelection::Range m_range; public: @@ -420,7 +420,7 @@ public: // RenumberUndo //----------------------------------------------------------------------------- -class RenumberUndo : public TUndo { +class RenumberUndo final : public TUndo { std::map m_undoTable, m_redoTable; public: @@ -464,7 +464,7 @@ public: } }; -class RenumberUndo::RedoNotifier : public TUndo { +class RenumberUndo::RedoNotifier final : public TUndo { void undo() const override {} void redo() const override { TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); @@ -474,7 +474,7 @@ class RenumberUndo::RedoNotifier : public TUndo { int getSize() const override { return sizeof(*this); } }; -class RenumberUndo::UndoNotifier : public TUndo { +class RenumberUndo::UndoNotifier final : public TUndo { void redo() const override {} void undo() const override { TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); @@ -548,7 +548,7 @@ bool pasteStrokesInCellWithoutUndo( // PasteStrokesInCellsUndo //----------------------------------------------------------------------------- -class PasteStrokesInCellUndo : public TUndo { +class PasteStrokesInCellUndo final : public TUndo { int m_row, m_col; StrokesData *m_strokesData; TFrameId m_fid; @@ -782,7 +782,7 @@ bool pasteRasterImageInCellWithoutUndo(int row, int col, // PasteToonzImageInCellsUndo //----------------------------------------------------------------------------- -class PasteToonzImageInCellsUndo : public ToolUtils::TRasterUndo { +class PasteToonzImageInCellsUndo final : public ToolUtils::TRasterUndo { RasterImageData *m_rasterImageData; public: @@ -817,7 +817,8 @@ public: // PasteFullColorImageInCellsUndo //----------------------------------------------------------------------------- -class PasteFullColorImageInCellsUndo : public ToolUtils::TFullColorRasterUndo { +class PasteFullColorImageInCellsUndo final + : public ToolUtils::TFullColorRasterUndo { RasterImageData *m_rasterImageData; public: @@ -868,7 +869,7 @@ void pasteDrawingsInCellWithoutUndo(TXsheet *xsh, TXshSimpleLevel *level, // PasteDrawingsInCellUndo //----------------------------------------------------------------------------- -class PasteDrawingsInCellUndo : public TUndo { +class PasteDrawingsInCellUndo final : public TUndo { TXsheet *m_xsheet; int m_r0, m_c0; set m_frameIds; @@ -930,7 +931,7 @@ bool pasteCellsWithoutUndo(int &r0, int &c0, int &r1, int &c1, //============================================================================= -class OverwritePasteCellsUndo : public TUndo { +class OverwritePasteCellsUndo final : public TUndo { TCellSelection *m_oldSelection; TCellSelection *m_newSelection; QMimeData *m_data; @@ -1646,7 +1647,7 @@ void TCellSelection::dRenumberCells() { //----------------------------------------------------------------------------- -class PasteNewCellUndo : public TUndo { +class PasteNewCellUndo final : public TUndo { TXshCell m_oldCell, m_newCell; TImageP m_img; int m_row, m_col; diff --git a/toonz/sources/toonz/cellselection.h b/toonz/sources/toonz/cellselection.h index 6e2eee7..c410344 100644 --- a/toonz/sources/toonz/cellselection.h +++ b/toonz/sources/toonz/cellselection.h @@ -13,7 +13,7 @@ class TimeStretchPopup; // TCellSelection //----------------------------------------------------------------------------- -class TCellSelection : public TSelection { +class TCellSelection final : public TSelection { TimeStretchPopup *m_timeStretchPopup; public: diff --git a/toonz/sources/toonz/cellselectioncommand.cpp b/toonz/sources/toonz/cellselectioncommand.cpp index 65363a6..af0274b 100644 --- a/toonz/sources/toonz/cellselectioncommand.cpp +++ b/toonz/sources/toonz/cellselectioncommand.cpp @@ -53,7 +53,7 @@ namespace { -class ReverseUndo : public TUndo { +class ReverseUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; public: @@ -101,7 +101,7 @@ void TCellSelection::reverseCells() { namespace { -class SwingUndo : public TUndo { +class SwingUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; public: @@ -160,7 +160,7 @@ void TCellSelection::swingCells() { namespace { -class IncrementUndo : public TUndo { +class IncrementUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; mutable std::vector> m_undoCells; @@ -245,7 +245,7 @@ void TCellSelection::incrementCells() { namespace { -class RandomUndo : public TUndo { +class RandomUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; std::vector m_shuffle; //!< Shuffled indices @@ -344,7 +344,7 @@ void TCellSelection::randomCells() { namespace { -class StepUndo : public TUndo { +class StepUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; int m_rowsCount, m_colsCount; @@ -445,7 +445,7 @@ void TCellSelection::stepCells(int step) { namespace { -class EachUndo : public TUndo { +class EachUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; int m_rowsCount, m_colsCount; @@ -549,7 +549,7 @@ void TCellSelection::eachCells(int each) { namespace { -class ReframeUndo : public TUndo { +class ReframeUndo final : public TUndo { int m_r0, m_r1; int m_type; int m_nr; @@ -705,7 +705,7 @@ void TColumnSelection::reframeCells(int count) { namespace { -class ResetStepUndo : public TUndo { +class ResetStepUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; int m_rowsCount, m_colsCount; @@ -804,7 +804,7 @@ void TCellSelection::resetStepCells() { namespace { -class IncreaseStepUndo : public TUndo { +class IncreaseStepUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; int m_rowsCount, m_colsCount; @@ -908,7 +908,7 @@ void TCellSelection::increaseStepCells() { namespace { -class DecreaseStepUndo : public TUndo { +class DecreaseStepUndo final : public TUndo { int m_r0, m_c0, m_r1, m_c1; int m_rowsCount, m_colsCount; @@ -1070,7 +1070,7 @@ void TCellSelection::rollupCells() { namespace { -class RolldownUndo : public RollupUndo { +class RolldownUndo final : public RollupUndo { public: RolldownUndo(int r0, int c0, int r1, int c1) : RollupUndo(r0, c0, r1, c1) {} @@ -1142,7 +1142,7 @@ void TCellSelection::setKeyframes() { namespace { -class CloneLevelUndo : public TUndo { +class CloneLevelUndo final : public TUndo { typedef std::map InsertedLevelsMap; typedef std::set InsertedColumnsSet; @@ -1211,7 +1211,7 @@ private: //----------------------------------------------------------------------------- -struct CloneLevelUndo::ExistsFunc : public OverwriteDialog::ExistsFunc { +struct CloneLevelUndo::ExistsFunc final : public OverwriteDialog::ExistsFunc { ToonzScene *m_scene; public: @@ -1231,7 +1231,7 @@ public: //----------------------------------------------------------------------------- -class CloneLevelUndo::LevelNamePopup : public DVGui::Dialog { +class CloneLevelUndo::LevelNamePopup final : public DVGui::Dialog { DVGui::LineEdit *m_name; QPushButton *m_ok, *m_cancel; diff --git a/toonz/sources/toonz/cleanuppaletteviewer.h b/toonz/sources/toonz/cleanuppaletteviewer.h index 916682f..1896a0c 100644 --- a/toonz/sources/toonz/cleanuppaletteviewer.h +++ b/toonz/sources/toonz/cleanuppaletteviewer.h @@ -27,7 +27,7 @@ class CleanupColorField; // CleanupPaletteViewer declaration //******************************************************************************** -class CleanupPaletteViewer : public QWidget { +class CleanupPaletteViewer final : public QWidget { Q_OBJECT TPaletteHandle *m_ph; diff --git a/toonz/sources/toonz/cleanuppopup.cpp b/toonz/sources/toonz/cleanuppopup.cpp index f413059..3713965 100644 --- a/toonz/sources/toonz/cleanuppopup.cpp +++ b/toonz/sources/toonz/cleanuppopup.cpp @@ -1580,7 +1580,7 @@ void CleanupPopup::updateTitleString() { // CleanupCommand definition //***************************************************************************** -class CleanupCommand : public MenuItemHandler { +class CleanupCommand final : public MenuItemHandler { public: CleanupCommand() : MenuItemHandler("MI_Cleanup") {} diff --git a/toonz/sources/toonz/cleanuppopup.h b/toonz/sources/toonz/cleanuppopup.h index c767e67..be2bad1 100644 --- a/toonz/sources/toonz/cleanuppopup.h +++ b/toonz/sources/toonz/cleanuppopup.h @@ -44,7 +44,7 @@ class QGroupBox; // CleanupPopup declaration //***************************************************************************** -class CleanupPopup : public QDialog { +class CleanupPopup final : public QDialog { Q_OBJECT public: @@ -141,7 +141,8 @@ private slots: // CleanupPopup::OverwriteDialog declaration (private) //***************************************************************************** -class CleanupPopup::OverwriteDialog : public DVGui::ValidatedChoiceDialog { +class CleanupPopup::OverwriteDialog final + : public DVGui::ValidatedChoiceDialog { Q_OBJECT public: diff --git a/toonz/sources/toonz/cleanuppreview.cpp b/toonz/sources/toonz/cleanuppreview.cpp index 1cfbf2e..e312d7c 100644 --- a/toonz/sources/toonz/cleanuppreview.cpp +++ b/toonz/sources/toonz/cleanuppreview.cpp @@ -392,7 +392,7 @@ void CameraTestToggleCommand::clean() { //============================================================================= /*! CameraTestのドラッグ移動のUndo */ -class UndoCameraTestMove : public TUndo { +class UndoCameraTestMove final : public TUndo { TPointD m_before, m_after; CleanupParameters *m_cp; @@ -437,7 +437,7 @@ public: //============================================================================= /*! CameraTestのサイズ変更のUndo */ -class UndoCameraTestScale : public TUndo { +class UndoCameraTestScale final : public TUndo { TDimension m_resBefore, m_resAfter; TDimensionD m_sizeBefore, m_sizeAfter; CleanupParameters *m_cp; @@ -492,7 +492,7 @@ public: // CameraTestTool definition //********************************************************************************** -class CameraTestTool : public TTool { +class CameraTestTool final : public TTool { TPointD m_lastPos; bool m_dragged; int m_scaling; @@ -869,7 +869,7 @@ int CameraTestTool::getCursorId() const { // //============================================================================== -class OpacityCheckToggleCommand : public MenuItemHandler { +class OpacityCheckToggleCommand final : public MenuItemHandler { public: OpacityCheckToggleCommand() : MenuItemHandler("MI_OpacityCheck") {} void execute() override { diff --git a/toonz/sources/toonz/cleanuppreview.h b/toonz/sources/toonz/cleanuppreview.h index 3838f7b..13f8ed4 100644 --- a/toonz/sources/toonz/cleanuppreview.h +++ b/toonz/sources/toonz/cleanuppreview.h @@ -28,7 +28,7 @@ class TTool; // PreviewToggleCommand declaration //********************************************************************************** -class PreviewToggleCommand : public MenuItemHandler { +class PreviewToggleCommand final : public MenuItemHandler { Q_OBJECT TXshSimpleLevelP m_sl; //!< Level under cleanup focus @@ -60,7 +60,7 @@ protected slots: // CameraTestToggleCommand declaration //********************************************************************************** -class CameraTestToggleCommand : public MenuItemHandler { +class CameraTestToggleCommand final : public MenuItemHandler { Q_OBJECT TTool *m_oldTool; diff --git a/toonz/sources/toonz/cleanupsettingsmodel.cpp b/toonz/sources/toonz/cleanupsettingsmodel.cpp index 41d1541..559caea 100644 --- a/toonz/sources/toonz/cleanupsettingsmodel.cpp +++ b/toonz/sources/toonz/cleanupsettingsmodel.cpp @@ -75,7 +75,7 @@ public: // SaveSettingsPopup //================================================================== -class SaveSettingsPopup : public IOSettingsPopup { +class SaveSettingsPopup final : public IOSettingsPopup { public: SaveSettingsPopup() : IOSettingsPopup(tr("Save Cleanup Settings")) { // addFilterType("tif"); @@ -111,7 +111,7 @@ public: // LoadSettingsPopup //================================================================== -class LoadSettingsPopup : public IOSettingsPopup { +class LoadSettingsPopup final : public IOSettingsPopup { public: LoadSettingsPopup() : IOSettingsPopup(tr("Load Cleanup Settings")) { setOkText(tr("Load")); diff --git a/toonz/sources/toonz/cleanupsettingsmodel.h b/toonz/sources/toonz/cleanupsettingsmodel.h index 96451ba..2a41955 100644 --- a/toonz/sources/toonz/cleanupsettingsmodel.h +++ b/toonz/sources/toonz/cleanupsettingsmodel.h @@ -61,7 +61,7 @@ to the "current cleanup palette handle" accessible through the TPaletteController. */ -class CleanupSettingsModel : public QObject { +class CleanupSettingsModel final : public QObject { Q_OBJECT int m_listenersCount; //!< Number of attached clients diff --git a/toonz/sources/toonz/cleanupsettingspane.h b/toonz/sources/toonz/cleanupsettingspane.h index f83cd2f..b0069d8 100644 --- a/toonz/sources/toonz/cleanupsettingspane.h +++ b/toonz/sources/toonz/cleanupsettingspane.h @@ -30,7 +30,7 @@ class IntField; フィールドのためのFileField。browseDirectoryを再実装して、フィールドが空欄のときは、 カレントレベル（Scan画像。TIF等）の入っているフォルダの１つ上をデフォルトフォルダにして開くようにしたい。 */ -class CleanupSaveInField : public DVGui::FileField { +class CleanupSaveInField final : public DVGui::FileField { Q_OBJECT public: CleanupSaveInField(QWidget *parent = 0, QString path = 0) @@ -40,7 +40,7 @@ protected slots: void browseDirectory() override; }; -class CleanupSettingsPane : public QFrame { +class CleanupSettingsPane final : public QFrame { Q_OBJECT public: //----Cleanup Camera Settings diff --git a/toonz/sources/toonz/cleanupsettingspopup.cpp b/toonz/sources/toonz/cleanupsettingspopup.cpp index 778be7f..593f4af 100644 --- a/toonz/sources/toonz/cleanupsettingspopup.cpp +++ b/toonz/sources/toonz/cleanupsettingspopup.cpp @@ -829,7 +829,7 @@ void CleanupSettings::onRestoreSceneSettings() { // Toggle Opacity Check Command //********************************************************************** -class ToggleOpacityCheckCommand : public MenuItemHandler { +class ToggleOpacityCheckCommand final : public MenuItemHandler { public: ToggleOpacityCheckCommand() : MenuItemHandler(MI_OpacityCheck) {} @@ -849,7 +849,7 @@ public: //********************************************************************** /* -class CleanupSettingsFactory : public TPanelFactory +class CleanupSettingsFactory final : public TPanelFactory { public: diff --git a/toonz/sources/toonz/cleanupsettingspopup.h b/toonz/sources/toonz/cleanupsettingspopup.h index 1879a04..0ef001b 100644 --- a/toonz/sources/toonz/cleanupsettingspopup.h +++ b/toonz/sources/toonz/cleanupsettingspopup.h @@ -45,7 +45,7 @@ class IntField; // CleanupSettingsPopup declaration //***************************************************************************** -class CleanupSettings : public QWidget { +class CleanupSettings final : public QWidget { Q_OBJECT CleanupTab *m_cleanupTab; @@ -94,7 +94,7 @@ private slots: // Cleanup Tab declaration //********************************************************************** -class CleanupTab : public QFrame { +class CleanupTab final : public QFrame { Q_OBJECT DVGui::CheckBox *m_autoCenter, *m_flipX, *m_flipY; @@ -122,7 +122,7 @@ private: // ProcessingTab declaration //********************************************************************** -class ProcessingTab : public QFrame { +class ProcessingTab final : public QFrame { Q_OBJECT CleanupPaletteViewer *m_paletteViewer; @@ -159,7 +159,7 @@ private slots: // CameraTab declaration //********************************************************************** -class CameraTab : public CleanupCameraSettingsWidget { +class CameraTab final : public CleanupCameraSettingsWidget { Q_OBJECT public: diff --git a/toonz/sources/toonz/cleanupswatch.h b/toonz/sources/toonz/cleanupswatch.h index e0eb02e..3890db1 100644 --- a/toonz/sources/toonz/cleanupswatch.h +++ b/toonz/sources/toonz/cleanupswatch.h @@ -5,10 +5,10 @@ // class QPushButton; class QAction; -class CleanupSwatch : public QWidget { +class CleanupSwatch final : public QWidget { Q_OBJECT - class CleanupSwatchArea : public QWidget { + class CleanupSwatchArea final : public QWidget { QPoint m_pos; bool m_isLeft, m_panning; CleanupSwatch *m_sw; diff --git a/toonz/sources/toonz/colormodelviewer.h b/toonz/sources/toonz/colormodelviewer.h index ded1fdc..e068080 100644 --- a/toonz/sources/toonz/colormodelviewer.h +++ b/toonz/sources/toonz/colormodelviewer.h @@ -9,7 +9,7 @@ // ColorModelViewer //----------------------------------------------------------------------------- -class ColorModelViewer : public FlipBook { +class ColorModelViewer final : public FlipBook { Q_OBJECT /*-- ツールのタイプを手元に持っておき、取得の手間を省く --*/ diff --git a/toonz/sources/toonz/columncommand.cpp b/toonz/sources/toonz/columncommand.cpp index 5e2d62d..3556110 100644 --- a/toonz/sources/toonz/columncommand.cpp +++ b/toonz/sources/toonz/columncommand.cpp @@ -471,7 +471,7 @@ void cloneSubXsheets(TXsheet *xsh) { // PasteColumnsUndo //----------------------------------------------------------------------------- -class PasteColumnsUndo : public TUndo { +class PasteColumnsUndo final : public TUndo { std::set m_indices; StageObjectsData *m_data; QMap m_columnLinks; @@ -532,7 +532,7 @@ public: // DeleteColumnsUndo //----------------------------------------------------------------------------- -class DeleteColumnsUndo : public TUndo { +class DeleteColumnsUndo final : public TUndo { std::set m_indices; QMap m_columnFxLinks; @@ -643,7 +643,7 @@ protected: // Insert Empty Columns Command //************************************************************************* -class InsertEmptyColumnsUndo : public ColumnCommandUndo { +class InsertEmptyColumnsUndo final : public ColumnCommandUndo { std::vector> m_columnBlocks; public: @@ -839,7 +839,7 @@ void ColumnCmd::cutColumns(std::set &indices) { // Undo Resequence //============================================================================= -class ResequenceUndo : public TUndo { +class ResequenceUndo final : public TUndo { int m_index; int m_r0; std::vector m_oldFrames; @@ -972,7 +972,7 @@ void ColumnCmd::resequence(int index) { // Undo cloneChild //============================================================================= -class CloneChildUndo : public TUndo { +class CloneChildUndo final : public TUndo { TXshChildLevelP m_childLevel; int m_columnIndex; @@ -1126,7 +1126,7 @@ void ColumnCmd::copyColumn(int dstIndex, int srcIndex) { // Undo Clear Cells //============================================================================= -class ClearColumnCellsUndo : public TUndo { +class ClearColumnCellsUndo final : public TUndo { int m_col; int m_r0; std::vector m_oldFrames; @@ -1213,7 +1213,7 @@ enum { } // namespace -class ColumnsStatusCommand : public MenuItemHandler { +class ColumnsStatusCommand final : public MenuItemHandler { int m_cmd, m_target; public: diff --git a/toonz/sources/toonz/columnselection.h b/toonz/sources/toonz/columnselection.h index c6ace6a..ab4aa71 100644 --- a/toonz/sources/toonz/columnselection.h +++ b/toonz/sources/toonz/columnselection.h @@ -11,7 +11,7 @@ // TColumnSelection //----------------------------------------------------------------------------- -class TColumnSelection : public TSelection { +class TColumnSelection final : public TSelection { std::set m_indices; public: diff --git a/toonz/sources/toonz/comboviewerpane.h b/toonz/sources/toonz/comboviewerpane.h index 8644b6e..c49f00e 100644 --- a/toonz/sources/toonz/comboviewerpane.h +++ b/toonz/sources/toonz/comboviewerpane.h @@ -37,7 +37,7 @@ enum CV_Parts { }; //----------------------------------------------------------------------------- -class ComboViewerPanel : public TPanel, public FlipConsoleOwner { +class ComboViewerPanel final : public TPanel, public FlipConsoleOwner { Q_OBJECT SceneViewer *m_sceneViewer; diff --git a/toonz/sources/toonz/convertpopup.cpp b/toonz/sources/toonz/convertpopup.cpp index bbda2dc..97ac0e6 100644 --- a/toonz/sources/toonz/convertpopup.cpp +++ b/toonz/sources/toonz/convertpopup.cpp @@ -85,7 +85,7 @@ const QString TlvExtension("tlv"); // //----------------------------------------------------------------------------- -class ConvertPopup::Converter : public QThread { +class ConvertPopup::Converter final : public QThread { int m_skippedCount; ConvertPopup *m_parent; diff --git a/toonz/sources/toonz/convertpopup.h b/toonz/sources/toonz/convertpopup.h index 0b3f71b..cc4ff5a 100644 --- a/toonz/sources/toonz/convertpopup.h +++ b/toonz/sources/toonz/convertpopup.h @@ -131,7 +131,7 @@ private: bool isSaveTlvBackupToNopaintActive(); }; -class ConvertPopupWithInput : public ConvertPopup { +class ConvertPopupWithInput final : public ConvertPopup { public: ConvertPopupWithInput() : ConvertPopup(true) {} }; diff --git a/toonz/sources/toonz/curveio.cpp b/toonz/sources/toonz/curveio.cpp index e9c2e29..535aeb4 100644 --- a/toonz/sources/toonz/curveio.cpp +++ b/toonz/sources/toonz/curveio.cpp @@ -12,7 +12,7 @@ //============================================================================= -class LoadCurveUndo : public TUndo { +class LoadCurveUndo final : public TUndo { TDoubleParamP m_curve; TDoubleParamP m_oldCurve, m_newCurve; @@ -70,7 +70,7 @@ public: //============================================================================= -class SaveCurvePopup : public CurvePopup { +class SaveCurvePopup final : public CurvePopup { public: SaveCurvePopup(const TFilePath folderPath, TDoubleParam *curve) : CurvePopup(tr("Save Curve"), folderPath, curve) { @@ -105,7 +105,7 @@ bool SaveCurvePopup::execute() { //============================================================================= -class LoadCurvePopup : public CurvePopup { +class LoadCurvePopup final : public CurvePopup { public: LoadCurvePopup(const TFilePath folderPath, TDoubleParam *curve) : CurvePopup(tr("Load Curve"), folderPath, curve) { @@ -146,7 +146,7 @@ bool LoadCurvePopup::execute() { //============================================================================= -class ExportCurvePopup : public CurvePopup { +class ExportCurvePopup final : public CurvePopup { std::string m_name; public: diff --git a/toonz/sources/toonz/drawingdata.h b/toonz/sources/toonz/drawingdata.h index ebd710f..90cf8c5 100644 --- a/toonz/sources/toonz/drawingdata.h +++ b/toonz/sources/toonz/drawingdata.h @@ -16,7 +16,7 @@ // Sono i fotogrammi della filmstrip //----------------------------------------------------------------------------- -class DrawingData : public DvMimeData { +class DrawingData final : public DvMimeData { public: std::map m_imageSet; // images are in the cache, the QString is the cache id diff --git a/toonz/sources/toonz/dummyprocessor.h b/toonz/sources/toonz/dummyprocessor.h index 857136e..ccca93c 100644 --- a/toonz/sources/toonz/dummyprocessor.h +++ b/toonz/sources/toonz/dummyprocessor.h @@ -6,7 +6,7 @@ #include "processor.h" //! A dummy Processor -class DummyProcessor : public Processor { +class DummyProcessor final : public Processor { std::vector m_dummyData; public: diff --git a/toonz/sources/toonz/duplicatepopup.cpp b/toonz/sources/toonz/duplicatepopup.cpp index 1d5e779..9e8aab2 100644 --- a/toonz/sources/toonz/duplicatepopup.cpp +++ b/toonz/sources/toonz/duplicatepopup.cpp @@ -30,7 +30,7 @@ namespace { //----------------------------------------------------------------------------- -class DuplicateUndo : public TUndo { +class DuplicateUndo final : public TUndo { int m_r0, m_c0; int m_r1, m_c1; int m_upTo; diff --git a/toonz/sources/toonz/duplicatepopup.h b/toonz/sources/toonz/duplicatepopup.h index 29b0c2c..714219f 100644 --- a/toonz/sources/toonz/duplicatepopup.h +++ b/toonz/sources/toonz/duplicatepopup.h @@ -15,7 +15,7 @@ class QPushButton; // DuplicatePopup //----------------------------------------------------------------------------- -class DuplicatePopup : public QDialog { +class DuplicatePopup final : public QDialog { Q_OBJECT QPushButton *m_okBtn; diff --git a/toonz/sources/toonz/dvdirtreeview.h b/toonz/sources/toonz/dvdirtreeview.h index 1e00133..966176e 100644 --- a/toonz/sources/toonz/dvdirtreeview.h +++ b/toonz/sources/toonz/dvdirtreeview.h @@ -36,7 +36,7 @@ class QFileSystemWatcher; // DvDirTreeView declaration //********************************************************************************** -class DvDirTreeView : public QTreeView, public TSelection { +class DvDirTreeView final : public QTreeView, public TSelection { Q_OBJECT QColor m_textColor; // text color (black) @@ -200,7 +200,7 @@ private: // DvDirTreeViewDelegate declaration //********************************************************************************** -class DvDirTreeViewDelegate : public QItemDelegate { +class DvDirTreeViewDelegate final : public QItemDelegate { Q_OBJECT public: @@ -237,7 +237,7 @@ private slots: // NodeEditor declaration //********************************************************************************** -class NodeEditor : public QWidget { +class NodeEditor final : public QWidget { Q_OBJECT public: diff --git a/toonz/sources/toonz/dvitemview.h b/toonz/sources/toonz/dvitemview.h index 7db1f0a..4a77553 100644 --- a/toonz/sources/toonz/dvitemview.h +++ b/toonz/sources/toonz/dvitemview.h @@ -100,7 +100,7 @@ protected: //============================================================================= -class ItemViewPlayWidget : public QWidget { +class ItemViewPlayWidget final : public QWidget { Q_OBJECT int m_currentItemIndex; //-1 -> pause @@ -159,7 +159,7 @@ protected: //============================================================================= -class DVItemViewPlayDelegate : public QObject { +class DVItemViewPlayDelegate final : public QObject { Q_OBJECT ItemViewPlayWidget *m_itemViewPlay; @@ -216,7 +216,7 @@ signals: //============================================================================= -class DvItemViewerPanel : public QFrame, public TSelection::View { +class DvItemViewerPanel final : public QFrame, public TSelection::View { Q_OBJECT QColor m_alternateBackground; // alaternate bg color for teble view @@ -429,7 +429,7 @@ signals: //============================================================================= -class DvItemViewerTitleBar : public QWidget { +class DvItemViewerTitleBar final : public QWidget { Q_OBJECT DvItemViewer *m_itemViewer; @@ -453,7 +453,7 @@ protected: //============================================================================= -class DvItemViewerButtonBar : public QToolBar { +class DvItemViewerButtonBar final : public QToolBar { Q_OBJECT QAction *m_folderBack; QAction *m_folderFwd; diff --git a/toonz/sources/toonz/dvwidgets.h b/toonz/sources/toonz/dvwidgets.h index 33896e2..3bdfd15 100644 --- a/toonz/sources/toonz/dvwidgets.h +++ b/toonz/sources/toonz/dvwidgets.h @@ -35,7 +35,7 @@ private: //----------------------------------------------------------------------------- -class PropertyComboBox : public QComboBox, public PropertyWidget { +class PropertyComboBox final : public QComboBox, public PropertyWidget { Q_OBJECT public: @@ -50,7 +50,7 @@ private: //----------------------------------------------------------------------------- -class PropertyCheckBox : public CheckBox, public PropertyWidget { +class PropertyCheckBox final : public CheckBox, public PropertyWidget { Q_OBJECT public: @@ -65,7 +65,7 @@ private: //----------------------------------------------------------------------------- -class PropertyLineEdit : public LineEdit, public PropertyWidget { +class PropertyLineEdit final : public LineEdit, public PropertyWidget { Q_OBJECT public: @@ -80,7 +80,7 @@ private: //----------------------------------------------------------------------------- -class PropertyIntField : public IntField, public PropertyWidget { +class PropertyIntField final : public IntField, public PropertyWidget { Q_OBJECT public: diff --git a/toonz/sources/toonz/exportlevelcommand.cpp b/toonz/sources/toonz/exportlevelcommand.cpp index 7feeb20..10e62f7 100644 --- a/toonz/sources/toonz/exportlevelcommand.cpp +++ b/toonz/sources/toonz/exportlevelcommand.cpp @@ -61,7 +61,7 @@ struct BusyCursorOverride { //--------------------------------------------------------------------------- -struct ExportOverwriteCB : public IoCmd::OverwriteCallbacks { +struct ExportOverwriteCB final : public IoCmd::OverwriteCallbacks { bool overwriteRequest(const TFilePath &fp) override { int ret = DVGui::MsgBox( QObject::tr("Warning: file %1 already exists.").arg(toQString(fp)), @@ -72,7 +72,7 @@ struct ExportOverwriteCB : public IoCmd::OverwriteCallbacks { //--------------------------------------------------------------------------- -struct ExportProgressCB : public IoCmd::ProgressCallbacks { +struct ExportProgressCB final : public IoCmd::ProgressCallbacks { QString m_processedName; ProgressDialog m_pb; diff --git a/toonz/sources/toonz/exportlevelpopup.cpp b/toonz/sources/toonz/exportlevelpopup.cpp index 58e683d..3dfa0d9 100644 --- a/toonz/sources/toonz/exportlevelpopup.cpp +++ b/toonz/sources/toonz/exportlevelpopup.cpp @@ -59,7 +59,7 @@ namespace { -struct MultiExportOverwriteCB : public IoCmd::OverwriteCallbacks { +struct MultiExportOverwriteCB final : public IoCmd::OverwriteCallbacks { bool m_yesToAll; bool m_stopped; @@ -81,7 +81,7 @@ struct MultiExportOverwriteCB : public IoCmd::OverwriteCallbacks { //============================================================================= -struct MultiExportProgressCB : public IoCmd::ProgressCallbacks { +struct MultiExportProgressCB final : public IoCmd::ProgressCallbacks { QString m_processedName; DVGui::ProgressDialog m_pb; @@ -114,7 +114,7 @@ public: // Swatch definition //******************************************************************************** -class ExportLevelPopup::Swatch : public PlaneViewer { +class ExportLevelPopup::Swatch final : public PlaneViewer { public: Swatch(QWidget *parent = 0) : PlaneViewer(parent) {} @@ -130,7 +130,7 @@ protected: void setActualPixelSize(); private: - struct ShortcutZoomer : public ImageUtils::ShortcutZoomer { + struct ShortcutZoomer final : public ImageUtils::ShortcutZoomer { ShortcutZoomer(Swatch *swatch) : ImageUtils::ShortcutZoomer(swatch) {} private: diff --git a/toonz/sources/toonz/exportlevelpopup.h b/toonz/sources/toonz/exportlevelpopup.h index 82a9444..4980cd3 100644 --- a/toonz/sources/toonz/exportlevelpopup.h +++ b/toonz/sources/toonz/exportlevelpopup.h @@ -55,7 +55,7 @@ class QHideEvent; /*! \brief The popup dealing with level exports in Toonz. */ -class ExportLevelPopup : public FileBrowserPopup { +class ExportLevelPopup final : public FileBrowserPopup { Q_OBJECT public: @@ -105,7 +105,7 @@ private slots: //----------------------------------------------------------------------------- -class ExportLevelPopup::ExportOptions : public QFrame { +class ExportLevelPopup::ExportOptions final : public QFrame { Q_OBJECT public: diff --git a/toonz/sources/toonz/exportpanel.h b/toonz/sources/toonz/exportpanel.h index eb62460..552fa99 100644 --- a/toonz/sources/toonz/exportpanel.h +++ b/toonz/sources/toonz/exportpanel.h @@ -35,7 +35,7 @@ class LineEdit; //----------------------------------------------------------------------------- -class ClipListViewer : public DvItemViewer, public DvItemListModel { +class ClipListViewer final : public DvItemViewer, public DvItemListModel { Q_OBJECT static const char *m_mimeFormat; @@ -79,7 +79,7 @@ public slots: //----------------------------------------------------------------------------- -class ExportPanel : public TPanel { +class ExportPanel final : public TPanel { Q_OBJECT ClipListViewer *m_clipListViewer; @@ -106,8 +106,8 @@ public slots: void openSettingsPopup(); }; -class RenderController : public QObject, - public MovieGenerator::Listener { // singleton +class RenderController final : public QObject, + public MovieGenerator::Listener { // singleton Q_OBJECT DVGui::ProgressDialog *m_progressDialog; int m_frame; diff --git a/toonz/sources/toonz/exportscenepopup.h b/toonz/sources/toonz/exportscenepopup.h index 59f33df..e00a80d 100644 --- a/toonz/sources/toonz/exportscenepopup.h +++ b/toonz/sources/toonz/exportscenepopup.h @@ -36,7 +36,7 @@ public: //============================================================================= // ExportSceneDvDirModelSpecialFileFolderNode -class ExportSceneDvDirModelSpecialFileFolderNode +class ExportSceneDvDirModelSpecialFileFolderNode final : public ExportSceneDvDirModelFileFolderNode { QPixmap m_pixmap; @@ -52,7 +52,7 @@ public: //============================================================================= // ExportSceneDvDirModelProjectNode -class ExportSceneDvDirModelProjectNode +class ExportSceneDvDirModelProjectNode final : public ExportSceneDvDirModelFileFolderNode { public: ExportSceneDvDirModelProjectNode(DvDirModelNode *parent, @@ -65,7 +65,7 @@ public: //============================================================================= // ExportSceneDvDirModelRootNode -class ExportSceneDvDirModelRootNode : public DvDirModelNode { +class ExportSceneDvDirModelRootNode final : public DvDirModelNode { std::vector m_projectRootNodes; ExportSceneDvDirModelFileFolderNode *m_sandboxProjectNode; void add(std::wstring name, const TFilePath &path); @@ -80,7 +80,7 @@ public: //============================================================================= // ExportSceneDvDirModel -class ExportSceneDvDirModel : public QAbstractItemModel { +class ExportSceneDvDirModel final : public QAbstractItemModel { DvDirModelNode *m_root; public: @@ -107,7 +107,7 @@ public: //============================================================================= // ExportSceneTreeViewDelegate -class ExportSceneTreeViewDelegate : public QItemDelegate { +class ExportSceneTreeViewDelegate final : public QItemDelegate { Q_OBJECT ExportSceneTreeView *m_treeView; @@ -123,7 +123,7 @@ public: //============================================================================= // ExportSceneTreeView -class ExportSceneTreeView : public QTreeView { +class ExportSceneTreeView final : public QTreeView { Q_OBJECT ExportSceneDvDirModel *m_model; @@ -147,7 +147,7 @@ signals: //============================================================================= // ExportScenePopup -class ExportScenePopup : public DVGui::Dialog { +class ExportScenePopup final : public DVGui::Dialog { Q_OBJECT std::vector m_scenes; diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cpp index ddc610f..ab03c59 100644 --- a/toonz/sources/toonz/filebrowser.cpp +++ b/toonz/sources/toonz/filebrowser.cpp @@ -99,7 +99,7 @@ using namespace DVGui; // FrameCountTask class //---------------------------- -class FrameCountTask : public TThread::Runnable { +class FrameCountTask final : public TThread::Runnable { bool m_started; TFilePath m_path; diff --git a/toonz/sources/toonz/filebrowser.h b/toonz/sources/toonz/filebrowser.h index 90c9aeb..cb50601 100644 --- a/toonz/sources/toonz/filebrowser.h +++ b/toonz/sources/toonz/filebrowser.h @@ -37,7 +37,7 @@ class QFileSystemWatcher; //! generator does. Calculated frame counts are also stored for quick lookup //! once they //! have been calculated the first time. -class FrameCountReader : public QObject { +class FrameCountReader final : public QObject { Q_OBJECT TThread::Executor m_executor; @@ -56,7 +56,7 @@ signals: //----------------------------------------------------------------------------- -class FileBrowser : public QFrame, public DvItemListModel { +class FileBrowser final : public QFrame, public DvItemListModel { Q_OBJECT public: @@ -267,7 +267,7 @@ private: }; //-------------------------------------------------------------------- -class RenameAsToonzPopup : public DVGui::Dialog { +class RenameAsToonzPopup final : public DVGui::Dialog { Q_OBJECT QPushButton *m_okBtn, *m_cancelBtn; DVGui::LineEdit *m_name; diff --git a/toonz/sources/toonz/filebrowsermodel.h b/toonz/sources/toonz/filebrowsermodel.h index 4da6ef3..830ad1f 100644 --- a/toonz/sources/toonz/filebrowsermodel.h +++ b/toonz/sources/toonz/filebrowsermodel.h @@ -125,7 +125,7 @@ public: //----------------------------------------------------------------------------- -class DvDirModelSceneFolderNode : public DvDirModelFileFolderNode { +class DvDirModelSceneFolderNode final : public DvDirModelFileFolderNode { std::map m_folders; public: @@ -145,7 +145,7 @@ public: //----------------------------------------------------------------------------- -class DvDirModelSpecialFileFolderNode : public DvDirModelFileFolderNode { +class DvDirModelSpecialFileFolderNode final : public DvDirModelFileFolderNode { QPixmap m_pixmap; public: @@ -206,7 +206,7 @@ public: //----------------------------------------------------------------------------- -class DvDirVersionControlRootNode : public DvDirVersionControlNode { +class DvDirVersionControlRootNode final : public DvDirVersionControlNode { QPixmap m_pixmap; std::wstring m_repositoryPath; std::wstring m_localPath; @@ -241,7 +241,7 @@ public: //----------------------------------------------------------------------------- -class DvDirVersionControlProjectNode : public DvDirVersionControlNode { +class DvDirVersionControlProjectNode final : public DvDirVersionControlNode { public: DvDirVersionControlProjectNode(DvDirModelNode *parent, std::wstring name, const TFilePath &path); @@ -256,7 +256,7 @@ public: //----------------------------------------------------------------------------- -class DvDirModelProjectNode : public DvDirModelFileFolderNode { +class DvDirModelProjectNode final : public DvDirModelFileFolderNode { public: DvDirModelProjectNode(DvDirModelNode *parent, const TFilePath &path); TFilePath getProjectPath() const; @@ -270,7 +270,7 @@ public: //----------------------------------------------------------------------------- -class DvDirModelDayNode : public DvDirModelNode { +class DvDirModelDayNode final : public DvDirModelNode { std::string m_dayDateString; public: @@ -282,7 +282,7 @@ public: //----------------------------------------------------------------------------- -class DvDirModelHistoryNode : public DvDirModelNode { +class DvDirModelHistoryNode final : public DvDirModelNode { public: DvDirModelHistoryNode(DvDirModelNode *parent); void refreshChildren() override; @@ -291,7 +291,7 @@ public: //----------------------------------------------------------------------------- -class DvDirModelMyComputerNode : public DvDirModelNode { +class DvDirModelMyComputerNode final : public DvDirModelNode { public: DvDirModelMyComputerNode(DvDirModelNode *parent); void refreshChildren() override; @@ -301,7 +301,7 @@ public: //----------------------------------------------------------------------------- -class DvDirModelNetworkNode : public DvDirModelNode { +class DvDirModelNetworkNode final : public DvDirModelNode { public: DvDirModelNetworkNode(DvDirModelNode *parent); void refreshChildren() override; @@ -311,7 +311,7 @@ public: //----------------------------------------------------------------------------- -class DvDirModelRootNode : public DvDirModelNode { +class DvDirModelRootNode final : public DvDirModelNode { std::vector m_projectRootNodes; std::vector m_versionControlNodes; DvDirModelMyComputerNode *m_myComputerNode; @@ -331,8 +331,8 @@ public: //============================================================================= // singleton -class DvDirModel : public QAbstractItemModel, - public FolderListenerManager::Listener { +class DvDirModel final : public QAbstractItemModel, + public FolderListenerManager::Listener { DvDirModelNode *m_root; public: diff --git a/toonz/sources/toonz/filebrowserpopup.h b/toonz/sources/toonz/filebrowserpopup.h index a043d59..ec07c38 100644 --- a/toonz/sources/toonz/filebrowserpopup.h +++ b/toonz/sources/toonz/filebrowserpopup.h @@ -152,7 +152,7 @@ protected slots: //! The GenericLoadFilePopup is a simple, standard Toonz popup that //! asks the user for \a single file to be loaded from disk. -class GenericLoadFilePopup : public FileBrowserPopup { +class GenericLoadFilePopup final : public FileBrowserPopup { public: GenericLoadFilePopup(const QString &title); @@ -171,7 +171,7 @@ protected: //! The GenericSaveFilePopup is a simple, standard Toonz popup that //! asks the user for a \a single file path to save something to. -class GenericSaveFilePopup : public FileBrowserPopup { +class GenericSaveFilePopup final : public FileBrowserPopup { public: GenericSaveFilePopup(const QString &title); @@ -191,7 +191,7 @@ protected: //----------------------------------------------------------------------------- -class LoadScenePopup : public FileBrowserPopup { +class LoadScenePopup final : public FileBrowserPopup { Q_OBJECT public: @@ -209,7 +209,7 @@ protected: //----------------------------------------------------------------------------- -class LoadSubScenePopup : public FileBrowserPopup { +class LoadSubScenePopup final : public FileBrowserPopup { Q_OBJECT public: @@ -224,7 +224,7 @@ protected: //----------------------------------------------------------------------------- -class SaveSceneAsPopup : public FileBrowserPopup { +class SaveSceneAsPopup final : public FileBrowserPopup { Q_OBJECT public: @@ -236,7 +236,7 @@ public: //----------------------------------------------------------------------------- -class SaveSubSceneAsPopup : public FileBrowserPopup { +class SaveSubSceneAsPopup final : public FileBrowserPopup { Q_OBJECT public: @@ -248,7 +248,7 @@ public: //----------------------------------------------------------------------------- -class LoadLevelPopup : public FileBrowserPopup { +class LoadLevelPopup final : public FileBrowserPopup { Q_OBJECT QFrame *m_subsequenceFrame; @@ -305,7 +305,7 @@ private: //----------------------------------------------------------------------------- -class SaveLevelAsPopup : public FileBrowserPopup { +class SaveLevelAsPopup final : public FileBrowserPopup { Q_OBJECT public: @@ -317,7 +317,7 @@ public: //----------------------------------------------------------------------------- -class ReplaceLevelPopup : public FileBrowserPopup { +class ReplaceLevelPopup final : public FileBrowserPopup { Q_OBJECT TCellSelection::Range m_range; @@ -338,7 +338,7 @@ protected slots: //----------------------------------------------------------------------------- -class SavePaletteAsPopup : public FileBrowserPopup { +class SavePaletteAsPopup final : public FileBrowserPopup { Q_OBJECT public: @@ -350,7 +350,7 @@ public: //----------------------------------------------------------------------------- -class LoadColorModelPopup : public FileBrowserPopup { +class LoadColorModelPopup final : public FileBrowserPopup { Q_OBJECT DVGui::LineEdit *m_paletteFrame; @@ -370,7 +370,7 @@ protected slots: //----------------------------------------------------------------------------- -class ImportMagpieFilePopup : public FileBrowserPopup { +class ImportMagpieFilePopup final : public FileBrowserPopup { Q_OBJECT public: @@ -387,7 +387,7 @@ protected: /*! replace the parent folder path of the levels in the selected cells */ -class ReplaceParentDirectoryPopup : public FileBrowserPopup { +class ReplaceParentDirectoryPopup final : public FileBrowserPopup { TCellSelection::Range m_range; bool m_replaceCells; // true : cell selection, false : column selection std::set m_columnRange; @@ -401,7 +401,7 @@ public: //----------------------------------------------------------------------------- -class BrowserPopup : public FileBrowserPopup { +class BrowserPopup final : public FileBrowserPopup { Q_OBJECT TFilePath m_path; @@ -417,8 +417,9 @@ public: //----------------------------------------------------------------------------- -class BrowserPopupController : public QObject, - public DVGui::FileField::BrowserPopupController { +class BrowserPopupController final + : public QObject, + public DVGui::FileField::BrowserPopupController { Q_OBJECT BrowserPopup *m_browserPopup; diff --git a/toonz/sources/toonz/filedata.h b/toonz/sources/toonz/filedata.h index b1f9bce..d81da96 100644 --- a/toonz/sources/toonz/filedata.h +++ b/toonz/sources/toonz/filedata.h @@ -10,7 +10,7 @@ // FileData //----------------------------------------------------------------------------- -class FileData : public DvMimeData { +class FileData final : public DvMimeData { public: std::vector m_files; diff --git a/toonz/sources/toonz/fileinfopopup.h b/toonz/sources/toonz/fileinfopopup.h index 008cbcc..6df0f91 100644 --- a/toonz/sources/toonz/fileinfopopup.h +++ b/toonz/sources/toonz/fileinfopopup.h @@ -15,7 +15,7 @@ class TFilePath; // FileInfoPopup //----------------------------------------------------------------------------- -class FileInfoPopup : public DVGui::Dialog { +class FileInfoPopup final : public DVGui::Dialog { Q_OBJECT typedef std::pair StringPair; diff --git a/toonz/sources/toonz/fileselection.cpp b/toonz/sources/toonz/fileselection.cpp index 383bb6e..2e0c3c9 100644 --- a/toonz/sources/toonz/fileselection.cpp +++ b/toonz/sources/toonz/fileselection.cpp @@ -53,7 +53,7 @@ namespace { // CopyFilesUndo //----------------------------------------------------------------------------- -class CopyFilesUndo : public TUndo { +class CopyFilesUndo final : public TUndo { QMimeData *m_oldData; QMimeData *m_newData; @@ -80,7 +80,7 @@ public: // PasteFilesUndo //----------------------------------------------------------------------------- -class PasteFilesUndo : public TUndo { +class PasteFilesUndo final : public TUndo { std::vector m_newFiles; TFilePath m_folder; @@ -130,7 +130,7 @@ public: // DuplicateUndo //----------------------------------------------------------------------------- -class DuplicateUndo : public TUndo { +class DuplicateUndo final : public TUndo { std::vector m_newFiles; std::vector m_files; diff --git a/toonz/sources/toonz/fileselection.h b/toonz/sources/toonz/fileselection.h index 417fc5b..d5a90b8 100644 --- a/toonz/sources/toonz/fileselection.h +++ b/toonz/sources/toonz/fileselection.h @@ -13,7 +13,7 @@ class ExportScenePopup; // FileSelection //----------------------------------------------------------------------------- -class FileSelection : public DvItemSelection { +class FileSelection final : public DvItemSelection { QList m_infoViewers; ExportScenePopup *m_exportScenePopup; diff --git a/toonz/sources/toonz/filmstrip.h b/toonz/sources/toonz/filmstrip.h index 970e850..7ce4fce 100644 --- a/toonz/sources/toonz/filmstrip.h +++ b/toonz/sources/toonz/filmstrip.h @@ -36,7 +36,7 @@ const int fs_iconMarginBottom = 15; // (inserita dentro Filmstrip : QScrollArea) //----------------------------------------------------------------------------- -class FilmstripFrames : public QFrame, public TSelection::View { +class FilmstripFrames final : public QFrame, public TSelection::View { Q_OBJECT public: @@ -191,7 +191,7 @@ private: // Filmstrip //----------------------------------------------------------------------------- -class Filmstrip : public QWidget { +class Filmstrip final : public QWidget { Q_OBJECT FilmstripFrames *m_frames; @@ -243,7 +243,7 @@ private: // inbetweenDialog //----------------------------------------------------------------------------- -class InbetweenDialog : public DVGui::Dialog { +class InbetweenDialog final : public DVGui::Dialog { Q_OBJECT QComboBox *m_comboBox; diff --git a/toonz/sources/toonz/filmstripcommand.cpp b/toonz/sources/toonz/filmstripcommand.cpp index e35d5aa..23af794 100644 --- a/toonz/sources/toonz/filmstripcommand.cpp +++ b/toonz/sources/toonz/filmstripcommand.cpp @@ -434,7 +434,7 @@ void insertNotEmptyframes(const TXshSimpleLevelP &sl, // PasteRasterAreasUndo //----------------------------------------------------------------------------- -class PasteRasterAreasUndo : public TUndo { +class PasteRasterAreasUndo final : public TUndo { TXshSimpleLevelP m_level; std::set m_frames; TTileSet *m_tiles; @@ -628,7 +628,7 @@ public: // PasteVectorAreasUndo //----------------------------------------------------------------------------- -class PasteVectorAreasUndo : public TUndo { +class PasteVectorAreasUndo final : public TUndo { TXshSimpleLevelP m_level; std::set m_frames; std::map> m_indices; @@ -748,7 +748,7 @@ public: // PasteAreasUndo //----------------------------------------------------------------------------- -class PasteAreasUndo : public TUndo +class PasteAreasUndo final : public TUndo { TXshSimpleLevelP m_level; std::set m_frames; @@ -867,7 +867,7 @@ TImageCache::instance()->get("PasteAreasUndoNew"+QString::number((UINT)this)+QSt // PasteFramesUndo //----------------------------------------------------------------------------- -class PasteFramesUndo : public TUndo { +class PasteFramesUndo final : public TUndo { TXshSimpleLevelP m_sl; std::set m_frames; std::vector m_oldLevelFrameId; @@ -987,7 +987,7 @@ public: // DeleteFramesUndo //----------------------------------------------------------------------------- -class DeleteFramesUndo : public TUndo { +class DeleteFramesUndo final : public TUndo { TXshSimpleLevel *m_sl; std::set m_frames; DrawingData *m_oldData; @@ -1040,7 +1040,7 @@ public: //----------------------------------------------------------------------------- -class CutFramesUndo : public TUndo { +class CutFramesUndo final : public TUndo { TXshSimpleLevel *m_sl; std::set m_framesCutted; std::vector m_oldFrames; @@ -1106,7 +1106,7 @@ public: namespace { //----------------------------------------------------------------------------- -class AddFramesUndo : public TUndo { +class AddFramesUndo final : public TUndo { TXshSimpleLevelP m_level; std::set m_insertedFids; std::vector m_oldFids; @@ -1201,7 +1201,7 @@ void FilmstripCmd::addFrames(TXshSimpleLevel *sl, int start, int end, namespace { -class RenumberUndo : public TUndo { +class RenumberUndo final : public TUndo { TXshSimpleLevelP m_level; std::vector m_fids; std::map m_mapOldFrameId; @@ -1611,7 +1611,7 @@ void insertEmptyFilmstripFrames(const TXshSimpleLevelP &sl, //----------------------------------------------------------------------------- -class UndoInsertEmptyFrames : public TUndo { +class UndoInsertEmptyFrames final : public TUndo { TXshSimpleLevelP m_level; std::vector m_oldFrames; std::set m_frames; @@ -1726,7 +1726,7 @@ void performReverse(const TXshSimpleLevelP &sl, //----------------------------------------------------------------------------- -class FilmstripReverseUndo : public TUndo { +class FilmstripReverseUndo final : public TUndo { TXshSimpleLevelP m_level; std::set m_frames; @@ -1797,7 +1797,7 @@ void performSwing(const TXshSimpleLevelP &sl, //----------------------------------------------------------------------------- -class FilmstripSwingUndo : public TUndo { +class FilmstripSwingUndo final : public TUndo { TXshSimpleLevelP m_level; std::set m_frames; std::set m_newFrames; @@ -1892,7 +1892,7 @@ void stepFilmstripFrames(const TXshSimpleLevelP &sl, //----------------------------------------------------------------------------- -class StepFilmstripUndo : public TUndo { +class StepFilmstripUndo final : public TUndo { TXshSimpleLevelP m_level; std::set m_insertedFrames; std::set m_frames; @@ -1992,7 +1992,7 @@ std::map eachFilmstripFrames( //----------------------------------------------------------------------------- -class EachFilmstripUndo : public TUndo { +class EachFilmstripUndo final : public TUndo { TXshSimpleLevelP m_level; std::set m_frames; std::map m_cutFrames; @@ -2054,7 +2054,7 @@ void FilmstripCmd::each(TXshSimpleLevel *sl, std::set &frames, namespace { //----------------------------------------------------------------------------- -class UndoDuplicateDrawing : public TUndo { +class UndoDuplicateDrawing final : public TUndo { TXshSimpleLevelP m_level; std::set m_frameInserted; std::vector m_oldFrames; @@ -2151,7 +2151,7 @@ void moveToSceneFrames(TXshLevel *level, const std::set &frames) { //----------------------------------------------------------------------------- -class MoveLevelToSceneUndo : public TUndo { +class MoveLevelToSceneUndo final : public TUndo { std::wstring m_levelName; int m_col; std::set m_fids; @@ -2257,7 +2257,7 @@ void FilmstripCmd::moveToScene(TXshSoundLevel *sl) { namespace { -class UndoInbetween : public TUndo { +class UndoInbetween final : public TUndo { TXshSimpleLevelP m_level; std::vector m_fids; std::vector m_images; diff --git a/toonz/sources/toonz/filmstripselection.h b/toonz/sources/toonz/filmstripselection.h index 476f01a..178d32a 100644 --- a/toonz/sources/toonz/filmstripselection.h +++ b/toonz/sources/toonz/filmstripselection.h @@ -13,7 +13,7 @@ class TXshSimpleLevel; // TFilmStripSelection //----------------------------------------------------------------------------- -class TFilmstripSelection : public TSelection { +class TFilmstripSelection final : public TSelection { public: typedef std::pair InbetweenRange; diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp index 089df7e..b8cc24e 100644 --- a/toonz/sources/toonz/flipbook.cpp +++ b/toonz/sources/toonz/flipbook.cpp @@ -303,7 +303,7 @@ enum { eBegin, eIncrement, eEnd }; static DVGui::ProgressDialog *Pd = 0; -class ProgressBarMessager : public TThread::Message { +class ProgressBarMessager final : public TThread::Message { public: int m_choice; int m_val; diff --git a/toonz/sources/toonz/flipbook.h b/toonz/sources/toonz/flipbook.h index d8b6f2c..a116f3c 100644 --- a/toonz/sources/toonz/flipbook.h +++ b/toonz/sources/toonz/flipbook.h @@ -25,7 +25,7 @@ class FlipBook; //============================================================================= -class SaveImagesPopup : public FileBrowserPopup { +class SaveImagesPopup final : public FileBrowserPopup { Q_OBJECT FlipBook *m_flip; @@ -36,7 +36,7 @@ public: bool execute() override; }; -class LoadImagesPopup : public FileBrowserPopup { +class LoadImagesPopup final : public FileBrowserPopup { Q_OBJECT DVGui::LineEdit *m_fromField; diff --git a/toonz/sources/toonz/floatingpanelcommand.h b/toonz/sources/toonz/floatingpanelcommand.h index 7f044b8..5cdf7e8 100644 --- a/toonz/sources/toonz/floatingpanelcommand.h +++ b/toonz/sources/toonz/floatingpanelcommand.h @@ -12,7 +12,7 @@ class TPanel; // Widget")); // the "paneName" create the right widget and set it to the pane -class OpenFloatingPanel : public MenuItemHandler { +class OpenFloatingPanel final : public MenuItemHandler { QString m_title; std::string m_panelType; diff --git a/toonz/sources/toonz/formatsettingspopups.h b/toonz/sources/toonz/formatsettingspopups.h index 3e2bf55..8389874 100644 --- a/toonz/sources/toonz/formatsettingspopups.h +++ b/toonz/sources/toonz/formatsettingspopups.h @@ -30,7 +30,7 @@ class PropertyComboBox; // FormatSettingsPopup definition //********************************************************************************** -class FormatSettingsPopup : public DVGui::Dialog { +class FormatSettingsPopup final : public DVGui::Dialog { Q_OBJECT public: diff --git a/toonz/sources/toonz/frameheadgadget.cpp b/toonz/sources/toonz/frameheadgadget.cpp index 6c553cd..e6ab484 100644 --- a/toonz/sources/toonz/frameheadgadget.cpp +++ b/toonz/sources/toonz/frameheadgadget.cpp @@ -649,7 +649,7 @@ bool FilmstripFrameHeadGadget::eventFilter(QObject *obj, QEvent *e) { //----------------------------------------------------------------------------- -class OnionSkinToggle : public MenuItemHandler { +class OnionSkinToggle final : public MenuItemHandler { public: OnionSkinToggle() : MenuItemHandler(MI_OnionSkin) {} void execute() override { diff --git a/toonz/sources/toonz/frameheadgadget.h b/toonz/sources/toonz/frameheadgadget.h index 83bc7f0..0fcf9fb 100644 --- a/toonz/sources/toonz/frameheadgadget.h +++ b/toonz/sources/toonz/frameheadgadget.h @@ -62,11 +62,11 @@ public: bool eventFilter(QObject *obj, QEvent *event) override; }; -class XsheetFrameHeadGadget : public FrameHeadGadget { +class XsheetFrameHeadGadget final : public FrameHeadGadget { public: }; -class FilmstripFrameHeadGadget : public FrameHeadGadget { +class FilmstripFrameHeadGadget final : public FrameHeadGadget { FilmstripFrames *m_filmstrip; int m_dy; diff --git a/toonz/sources/toonz/fxparameditorpopup.h b/toonz/sources/toonz/fxparameditorpopup.h index b26a9cc..576ebb2 100644 --- a/toonz/sources/toonz/fxparameditorpopup.h +++ b/toonz/sources/toonz/fxparameditorpopup.h @@ -9,7 +9,7 @@ // FxParamEditorPopup //----------------------------------------------------------------------------- -class FxParamEditorPopup : public QDialog { +class FxParamEditorPopup final : public QDialog { Q_OBJECT public: diff --git a/toonz/sources/toonz/histogrampopup.h b/toonz/sources/toonz/histogrampopup.h index cc3db16..18cb3a1 100644 --- a/toonz/sources/toonz/histogrampopup.h +++ b/toonz/sources/toonz/histogrampopup.h @@ -34,7 +34,7 @@ public: // ViewerHistogramPopup //----------------------------------------------------------------------------- -class ViewerHistogramPopup : public HistogramPopup { +class ViewerHistogramPopup final : public HistogramPopup { Q_OBJECT public: diff --git a/toonz/sources/toonz/historypane.h b/toonz/sources/toonz/historypane.h index 9311002..0376539 100644 --- a/toonz/sources/toonz/historypane.h +++ b/toonz/sources/toonz/historypane.h @@ -5,7 +5,7 @@ #include -class HistoryField : public QFrame { +class HistoryField final : public QFrame { Q_OBJECT QScrollArea *m_scrollArea; @@ -29,7 +29,7 @@ protected: void mousePressEvent(QMouseEvent *event) override; }; -class HistoryPane : public QWidget { +class HistoryPane final : public QWidget { Q_OBJECT HistoryField *m_field; diff --git a/toonz/sources/toonz/imageviewer.cpp b/toonz/sources/toonz/imageviewer.cpp index 93e9ccc..84ae895 100644 --- a/toonz/sources/toonz/imageviewer.cpp +++ b/toonz/sources/toonz/imageviewer.cpp @@ -111,7 +111,7 @@ inline TRectD getImageBoundsD(const TImageP &img) { //----------------------------------------------------------------------------- -class FlipZoomer : public ImageUtils::ShortcutZoomer { +class FlipZoomer final : public ImageUtils::ShortcutZoomer { public: FlipZoomer(ImageViewer *parent) : ShortcutZoomer(parent) {} @@ -1160,7 +1160,7 @@ void ImageViewer::keyPressEvent(QKeyEvent *event) { //----------------------------------------------------------------------------- /*! load image from history */ -class LoadRecentFlipbookImagesCommandHandler : public MenuItemHandler { +class LoadRecentFlipbookImagesCommandHandler final : public MenuItemHandler { public: LoadRecentFlipbookImagesCommandHandler() : MenuItemHandler(MI_LoadRecentImage) {} @@ -1188,7 +1188,7 @@ public: //----------------------------------------------------------------------------- /*! clear the history */ -class ClearRecentFlipbookImagesCommandHandler : public MenuItemHandler { +class ClearRecentFlipbookImagesCommandHandler final : public MenuItemHandler { public: ClearRecentFlipbookImagesCommandHandler() : MenuItemHandler(MI_ClearRecentImage) {} diff --git a/toonz/sources/toonz/imageviewer.h b/toonz/sources/toonz/imageviewer.h index 7318151..0d8655c 100644 --- a/toonz/sources/toonz/imageviewer.h +++ b/toonz/sources/toonz/imageviewer.h @@ -22,7 +22,7 @@ class HistogramPopup; // ImageViewer //-------------------- -class ImageViewer : public QOpenGLWidget { +class ImageViewer final : public QOpenGLWidget { Q_OBJECT enum DragType { eNone, diff --git a/toonz/sources/toonz/insertfxpopup.h b/toonz/sources/toonz/insertfxpopup.h index 3085220..3fdc1bb 100644 --- a/toonz/sources/toonz/insertfxpopup.h +++ b/toonz/sources/toonz/insertfxpopup.h @@ -18,7 +18,7 @@ class TFx; // InsertFxPopup //----------------------------------------------------------------------------- -class InsertFxPopup : public DVGui::Dialog { +class InsertFxPopup final : public DVGui::Dialog { Q_OBJECT QTreeWidget *m_fxTree; diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp index ae71d85..69bf2b7 100644 --- a/toonz/sources/toonz/iocommand.cpp +++ b/toonz/sources/toonz/iocommand.cpp @@ -102,7 +102,7 @@ class RenderingSuspender; // class ResourceImportDialog //--------------------------------------------------------------------------- -class ResourceImportDialog : public ResourceImportStrategy { +class ResourceImportDialog final : public ResourceImportStrategy { OverwriteDialog *m_dialog; bool m_isLastResource; bool m_importQuestionAsked; @@ -350,7 +350,7 @@ int getLevelType(const TFilePath &actualPath) { // class LoadLevelUndo //--------------------------------------------------------------------------- -class LoadLevelUndo : public TUndo { +class LoadLevelUndo final : public TUndo { TXshLevelP m_level; TFilePath m_levelSetFolder; int m_row, m_col, m_rowCount; @@ -452,7 +452,7 @@ public: // class LoadLevelAndReplaceUndo //--------------------------------------------------------------------------- -class LoadAndReplaceLevelUndo : public TUndo { +class LoadAndReplaceLevelUndo final : public TUndo { TXshSimpleLevelP m_level; QMap, QPair> m_oldLevels; int m_row0, m_col0, m_row1, m_col1; @@ -582,7 +582,7 @@ void substituteLevel(TXsheet *xsh, TXshLevel *srcLevel, TXshLevel *dstLevel) { // class ChildLevelResourceImporter //--------------------------------------------------------------------------- -class ChildLevelResourceImporter : public ResourceProcessor { +class ChildLevelResourceImporter final : public ResourceProcessor { ToonzScene *m_parentScene; ToonzScene *m_childScene; @@ -990,7 +990,7 @@ enum ExposeType { eOverWrite, eShiftCells, eNone }; // class ExposeLevelUndo //--------------------------------------------------------------------------- -class ExposeLevelUndo : public TUndo { +class ExposeLevelUndo final : public TUndo { TXshSimpleLevelP m_sl; std::vector m_oldCells; std::vector m_fids; @@ -1070,7 +1070,7 @@ public: // class ExposeCommentUndo //--------------------------------------------------------------------------- -class ExposeCommentUndo : public TUndo { +class ExposeCommentUndo final : public TUndo { TXshSoundTextColumnP m_soundtextColumn; int m_col; bool m_insertEmptyColumn; @@ -2454,7 +2454,7 @@ bool IoCmd::importLipSync(TFilePath levelPath, QList frameList, // Commands //--------------------------------------------------------------------------- -class SaveSceneCommandHandler : public MenuItemHandler { +class SaveSceneCommandHandler final : public MenuItemHandler { public: SaveSceneCommandHandler() : MenuItemHandler(MI_SaveScene) {} void execute() override { IoCmd::saveScene(); } @@ -2462,7 +2462,7 @@ public: //--------------------------------------------------------------------------- -class SaveLevelCommandHandler : public MenuItemHandler { +class SaveLevelCommandHandler final : public MenuItemHandler { public: SaveLevelCommandHandler() : MenuItemHandler(MI_SaveLevel) {} void execute() override { @@ -2495,7 +2495,7 @@ public: //----------------------------------------------------------------------------- -class SaveProjectTemplate : public MenuItemHandler { +class SaveProjectTemplate final : public MenuItemHandler { public: SaveProjectTemplate() : MenuItemHandler(MI_SaveDefaultSettings) {} void execute() override { @@ -2517,7 +2517,7 @@ public: //----------------------------------------------------------------------------- -class OpenRecentSceneFileCommandHandler : public MenuItemHandler { +class OpenRecentSceneFileCommandHandler final : public MenuItemHandler { public: OpenRecentSceneFileCommandHandler() : MenuItemHandler(MI_OpenRecentScene) {} void execute() override { @@ -2533,7 +2533,7 @@ public: //----------------------------------------------------------------------------- -class OpenRecentLevelFileCommandHandler : public MenuItemHandler { +class OpenRecentLevelFileCommandHandler final : public MenuItemHandler { public: OpenRecentLevelFileCommandHandler() : MenuItemHandler(MI_OpenRecentLevel) {} void execute() override { @@ -2556,7 +2556,7 @@ public: //----------------------------------------------------------------------------- -class ClearRecentSceneFileListCommandHandler : public MenuItemHandler { +class ClearRecentSceneFileListCommandHandler final : public MenuItemHandler { public: ClearRecentSceneFileListCommandHandler() : MenuItemHandler(MI_ClearRecentScene) {} @@ -2567,7 +2567,7 @@ public: //----------------------------------------------------------------------------- -class ClearRecentLevelFileListCommandHandler : public MenuItemHandler { +class ClearRecentLevelFileListCommandHandler final : public MenuItemHandler { public: ClearRecentLevelFileListCommandHandler() : MenuItemHandler(MI_ClearRecentLevel) {} @@ -2578,7 +2578,7 @@ public: //----------------------------------------------------------------------------- -class RevertScene : public MenuItemHandler { +class RevertScene final : public MenuItemHandler { public: RevertScene() : MenuItemHandler(MI_RevertScene) {} void execute() override { @@ -2607,7 +2607,7 @@ public: //============================================================================= // Overwrite palette //----------------------------------------------------------------------------- -class OverwritePaletteCommandHandler : public MenuItemHandler { +class OverwritePaletteCommandHandler final : public MenuItemHandler { public: OverwritePaletteCommandHandler() : MenuItemHandler(MI_OverwritePalette) {} @@ -2696,7 +2696,7 @@ public: //============================================================================= // Save scene and levels //----------------------------------------------------------------------------- -class SaveAllCommandHandler : public MenuItemHandler { +class SaveAllCommandHandler final : public MenuItemHandler { public: SaveAllCommandHandler() : MenuItemHandler(MI_SaveAll) {} void execute() override { IoCmd::saveAll(); } diff --git a/toonz/sources/toonz/iocommand.h b/toonz/sources/toonz/iocommand.h index 4ce3886..17f6fdb 100644 --- a/toonz/sources/toonz/iocommand.h +++ b/toonz/sources/toonz/iocommand.h @@ -156,7 +156,7 @@ public: //------------------------------------------------------------------------ -class ConvertingPopup : public QDialog { +class ConvertingPopup final : public QDialog { public: ConvertingPopup(QWidget *parent, QString fileName); ~ConvertingPopup(); diff --git a/toonz/sources/toonz/keyframedata.h b/toonz/sources/toonz/keyframedata.h index ee73bc3..28f8696 100644 --- a/toonz/sources/toonz/keyframedata.h +++ b/toonz/sources/toonz/keyframedata.h @@ -15,7 +15,7 @@ class TXsheet; // TKeyframeData //----------------------------------------------------------------------------- -class TKeyframeData : public DvMimeData { +class TKeyframeData final : public DvMimeData { public: typedef TKeyframeSelection::Position Position; typedef std::map KeyData; diff --git a/toonz/sources/toonz/keyframemover.cpp b/toonz/sources/toonz/keyframemover.cpp index 51ba960..4eb135c 100644 --- a/toonz/sources/toonz/keyframemover.cpp +++ b/toonz/sources/toonz/keyframemover.cpp @@ -197,7 +197,7 @@ namespace { // UndoMoveKeyFrame //----------------------------------------------------------------------------- -class UndoMoveKeyFrame : public TUndo { +class UndoMoveKeyFrame final : public TUndo { int m_dr; KeyframeMover *m_mover; diff --git a/toonz/sources/toonz/keyframemover.h b/toonz/sources/toonz/keyframemover.h index cb47b56..7660eba 100644 --- a/toonz/sources/toonz/keyframemover.h +++ b/toonz/sources/toonz/keyframemover.h @@ -65,7 +65,7 @@ public: // KeyframeMoverTool //----------------------------------------------------------------------------- -class KeyframeMoverTool : public XsheetGUI::DragTool { +class KeyframeMoverTool final : public XsheetGUI::DragTool { TKeyframeSelection m_startSelection; int m_offset; int m_firstRow, m_firstCol; diff --git a/toonz/sources/toonz/keyframeselection.cpp b/toonz/sources/toonz/keyframeselection.cpp index f33f29a..526a326 100644 --- a/toonz/sources/toonz/keyframeselection.cpp +++ b/toonz/sources/toonz/keyframeselection.cpp @@ -119,7 +119,7 @@ bool deleteKeyframesWithoutUndo( // PasteKeyframesUndo //----------------------------------------------------------------------------- -class PasteKeyframesUndo : public TUndo { +class PasteKeyframesUndo final : public TUndo { TKeyframeSelection *m_selection; QMimeData *m_newData; QMimeData *m_oldData; @@ -173,7 +173,7 @@ public: // DeleteKeyframesUndo //----------------------------------------------------------------------------- -class DeleteKeyframesUndo : public TUndo { +class DeleteKeyframesUndo final : public TUndo { TKeyframeSelection *m_selection; QMimeData *m_data; int m_r0, m_r1, m_c0, m_c1; diff --git a/toonz/sources/toonz/keyframeselection.h b/toonz/sources/toonz/keyframeselection.h index ffe43f5..ca5dfe6 100644 --- a/toonz/sources/toonz/keyframeselection.h +++ b/toonz/sources/toonz/keyframeselection.h @@ -10,7 +10,7 @@ // TKeyframeSelection //----------------------------------------------------------------------------- -class TKeyframeSelection : public TSelection { +class TKeyframeSelection final : public TSelection { public: typedef std::pair Position; // row, col diff --git a/toonz/sources/toonz/levelcommand.cpp b/toonz/sources/toonz/levelcommand.cpp index bbbbd0f..665d321 100644 --- a/toonz/sources/toonz/levelcommand.cpp +++ b/toonz/sources/toonz/levelcommand.cpp @@ -35,7 +35,7 @@ namespace { -class DeleteLevelUndo : public TUndo { +class DeleteLevelUndo final : public TUndo { TXshLevelP m_xl; public: @@ -66,7 +66,7 @@ public: // RemoveUnusedLevelCommand //----------------------------------------------------------------------------- -class RemoveUnusedLevelsCommand : public MenuItemHandler { +class RemoveUnusedLevelsCommand final : public MenuItemHandler { public: RemoveUnusedLevelsCommand() : MenuItemHandler(MI_RemoveUnused) {} @@ -108,7 +108,7 @@ public: // RemoveLevelCommand //----------------------------------------------------------------------------- -class RemoveLevelCommand : public MenuItemHandler { +class RemoveLevelCommand final : public MenuItemHandler { public: RemoveLevelCommand() : MenuItemHandler(MI_RemoveLevel) {} @@ -242,7 +242,7 @@ bool loadLastSaveFids(TXshSimpleLevel *sl, // Undo RevertToCommandUndo //----------------------------------------------------------------------------- -class RevertToCommandUndo : public TUndo { +class RevertToCommandUndo final : public TUndo { TXshSimpleLevel *m_sl; std::vector m_replacedImgsId; std::set m_selectedFids; @@ -409,7 +409,7 @@ void revertTo(bool isCleanedUp) { // RevertToCleanedUpCommand //----------------------------------------------------------------------------- -class RevertToCleanedUpCommand : public MenuItemHandler { +class RevertToCleanedUpCommand final : public MenuItemHandler { public: RevertToCleanedUpCommand() : MenuItemHandler(MI_RevertToCleanedUp) {} @@ -421,7 +421,7 @@ public: // RevertToLastSaveCommand //----------------------------------------------------------------------------- -class RevertToLastSaveCommand : public MenuItemHandler { +class RevertToLastSaveCommand final : public MenuItemHandler { public: RevertToLastSaveCommand() : MenuItemHandler(MI_RevertToLastSaved) {} diff --git a/toonz/sources/toonz/levelcreatepopup.cpp b/toonz/sources/toonz/levelcreatepopup.cpp index d37ef0f..c47cdef 100644 --- a/toonz/sources/toonz/levelcreatepopup.cpp +++ b/toonz/sources/toonz/levelcreatepopup.cpp @@ -67,7 +67,7 @@ const QString ScanLevel("Scan Level"); // CreateLevelUndo //----------------------------------------------------------------------------- -class CreateLevelUndo : public TUndo { +class CreateLevelUndo final : public TUndo { int m_rowIndex; int m_columnIndex; int m_frameCount; diff --git a/toonz/sources/toonz/levelcreatepopup.h b/toonz/sources/toonz/levelcreatepopup.h index d5b58e7..0799947 100644 --- a/toonz/sources/toonz/levelcreatepopup.h +++ b/toonz/sources/toonz/levelcreatepopup.h @@ -17,7 +17,7 @@ class QComboBox; // LevelCreatePopup //----------------------------------------------------------------------------- -class LevelCreatePopup : public DVGui::Dialog { +class LevelCreatePopup final : public DVGui::Dialog { Q_OBJECT DVGui::LineEdit *m_nameFld; diff --git a/toonz/sources/toonz/levelsettingspopup.cpp b/toonz/sources/toonz/levelsettingspopup.cpp index 0c4f458..35d413c 100644 --- a/toonz/sources/toonz/levelsettingspopup.cpp +++ b/toonz/sources/toonz/levelsettingspopup.cpp @@ -1048,7 +1048,7 @@ OpenPopupCommandHandler openLevelSettingsPopup( //----------------------------------------------------------------------------- -class ViewLevelFileInfoHandler : public MenuItemHandler { +class ViewLevelFileInfoHandler final : public MenuItemHandler { public: ViewLevelFileInfoHandler(CommandId cmdId) : MenuItemHandler(cmdId) {} @@ -1106,7 +1106,7 @@ public: //----------------------------------------------------------------------------- -class ViewLevelHandler : public MenuItemHandler { +class ViewLevelHandler final : public MenuItemHandler { public: ViewLevelHandler(CommandId cmdId) : MenuItemHandler(cmdId) {} diff --git a/toonz/sources/toonz/levelsettingspopup.h b/toonz/sources/toonz/levelsettingspopup.h index 76bc9a9..955ce10 100644 --- a/toonz/sources/toonz/levelsettingspopup.h +++ b/toonz/sources/toonz/levelsettingspopup.h @@ -31,7 +31,7 @@ class CheckBox; // LevelSettingsPopup //----------------------------------------------------------------------------- -class LevelSettingsPopup : public DVGui::Dialog { +class LevelSettingsPopup final : public DVGui::Dialog { Q_OBJECT TXshSimpleLevelP m_sl; diff --git a/toonz/sources/toonz/linesfadepopup.cpp b/toonz/sources/toonz/linesfadepopup.cpp index 4dee3a8..4e4f8c6 100644 --- a/toonz/sources/toonz/linesfadepopup.cpp +++ b/toonz/sources/toonz/linesfadepopup.cpp @@ -93,7 +93,7 @@ pix->m=(UCHAR)(pix->m+intensity*(col.m-pix->m));*/ // BrightnessAndContrastPopup Swatch //************************************************************************** -class LinesFadePopup::Swatch : public PlaneViewer { +class LinesFadePopup::Swatch final : public PlaneViewer { TRasterP m_ras; public: @@ -295,7 +295,7 @@ void LinesFadePopup::hideEvent(QHideEvent *he) { //----------------------------------------------------------------------------- -class TLineFadeUndo : public TUndo { +class TLineFadeUndo final : public TUndo { int m_r, m_c; TPixel32 m_color; int m_intensity; diff --git a/toonz/sources/toonz/linesfadepopup.h b/toonz/sources/toonz/linesfadepopup.h index 25bbb0b..e588ba8 100644 --- a/toonz/sources/toonz/linesfadepopup.h +++ b/toonz/sources/toonz/linesfadepopup.h @@ -20,7 +20,7 @@ class IntField; // LinesFadePopup //----------------------------------------------------------------------------- -class LinesFadePopup : public DVGui::Dialog { +class LinesFadePopup final : public DVGui::Dialog { Q_OBJECT DVGui::ColorField *m_linesColorField; diff --git a/toonz/sources/toonz/linetestcapturepane.cpp b/toonz/sources/toonz/linetestcapturepane.cpp index 5a9f876..1f716f5 100644 --- a/toonz/sources/toonz/linetestcapturepane.cpp +++ b/toonz/sources/toonz/linetestcapturepane.cpp @@ -51,7 +51,7 @@ //----------------------------------------------------------------------------- namespace { -class ViewerZoomer : public ImageUtils::ShortcutZoomer { +class ViewerZoomer final : public ImageUtils::ShortcutZoomer { public: ViewerZoomer(QWidget *parent) : ShortcutZoomer(parent) {} void zoom(bool zoomin, bool resetZoom) { @@ -78,7 +78,7 @@ ToggleCommandHandler capturePanelFieldGuideToggle(MI_CapturePanelFieldGuide, // CaptureCommand //----------------------------------------------------------------------------- -class CaptureCommand : public MenuItemHandler { +class CaptureCommand final : public MenuItemHandler { public: CaptureCommand() : MenuItemHandler(MI_Capture) {} void execute() {} diff --git a/toonz/sources/toonz/linetestcapturepane.h b/toonz/sources/toonz/linetestcapturepane.h index 55e1804..b680f34 100644 --- a/toonz/sources/toonz/linetestcapturepane.h +++ b/toonz/sources/toonz/linetestcapturepane.h @@ -32,7 +32,7 @@ class CaptureParameters; //============================================================================= // LineTestImageViewer -class LineTestImageViewer : public QWidget, public CameraImageViewer { +class LineTestImageViewer final : public QWidget, public CameraImageViewer { Q_OBJECT QPoint m_pos; @@ -88,7 +88,7 @@ protected: //=================================================================== // ChooseCameraDialog -class ChooseCameraDialog : public DVGui::Dialog { +class ChooseCameraDialog final : public DVGui::Dialog { Q_OBJECT int m_cameraIndex; @@ -107,7 +107,7 @@ protected slots: //=================================================================== // CaptureSettingsPopup -class CaptureSettingsPopup : public DVGui::Dialog { +class CaptureSettingsPopup final : public DVGui::Dialog { Q_OBJECT QPushButton *m_defineDeviceButton; @@ -149,7 +149,7 @@ signals: //=================================================================== // FileSettingsPopup -class FileSettingsPopup : public DVGui::Dialog { +class FileSettingsPopup final : public DVGui::Dialog { Q_OBJECT DVGui::FileField *m_pathField; @@ -173,7 +173,7 @@ protected slots: //============================================================================= // LineTestCapturePane -class LineTestCapturePane : public TPanel { +class LineTestCapturePane final : public TPanel { Q_OBJECT LineTestImageViewer *m_imageView; diff --git a/toonz/sources/toonz/linetestpane.h b/toonz/sources/toonz/linetestpane.h index c876c22..339f3a2 100644 --- a/toonz/sources/toonz/linetestpane.h +++ b/toonz/sources/toonz/linetestpane.h @@ -22,7 +22,7 @@ class QStackedWidget; // MixAudioThread //----------------------------------------------------------------------------- -class MixAudioThread : public QThread { +class MixAudioThread final : public QThread { Q_OBJECT bool m_abort; @@ -57,7 +57,7 @@ signals: // LineTestPanel //----------------------------------------------------------------------------- // Andrebbe messo a fattor comune del codice con ViewerPane -class LineTestPane : public TPanel { +class LineTestPane final : public TPanel { Q_OBJECT QStackedWidget *m_stackedWidget; diff --git a/toonz/sources/toonz/linetestviewer.cpp b/toonz/sources/toonz/linetestviewer.cpp index 2c8fa85..f40aed0 100644 --- a/toonz/sources/toonz/linetestviewer.cpp +++ b/toonz/sources/toonz/linetestviewer.cpp @@ -86,7 +86,7 @@ void initToonzEvent(TMouseEvent &toonzEvent, QMouseEvent *event, //----------------------------------------------------------------------------- -class ViewerZoomer : public ImageUtils::ShortcutZoomer { +class ViewerZoomer final : public ImageUtils::ShortcutZoomer { public: ViewerZoomer(QWidget *parent) : ShortcutZoomer(parent) {} void zoom(bool zoomin, bool resetZoom) { @@ -351,7 +351,7 @@ dare seri problemi!!!! // ras->lock(); // memcpy( ptr, ras->getRawData(), dataSize); // glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB); // release pointer - //to + // to // mapping buffer // ras->unlock(); // } diff --git a/toonz/sources/toonz/linetestviewer.h b/toonz/sources/toonz/linetestviewer.h index 81676f1..b9f4081 100644 --- a/toonz/sources/toonz/linetestviewer.h +++ b/toonz/sources/toonz/linetestviewer.h @@ -23,9 +23,9 @@ // Andrebbe messo a fattor comune del codice con SceneViewer #ifdef USE_QPAINTER -class LineTestViewer : public QWidget +class LineTestViewer final : public QWidget #else -class LineTestViewer : public QOpenGLWidget +class LineTestViewer final : public QOpenGLWidget #endif { Q_OBJECT diff --git a/toonz/sources/toonz/loadfoldercommand.cpp b/toonz/sources/toonz/loadfoldercommand.cpp index c8da846..7808c1a 100644 --- a/toonz/sources/toonz/loadfoldercommand.cpp +++ b/toonz/sources/toonz/loadfoldercommand.cpp @@ -133,7 +133,7 @@ public: // OverwriteDialog definition //************************************************************************ -class OverwriteDialog : public DVGui::ValidatedChoiceDialog { +class OverwriteDialog final : public DVGui::ValidatedChoiceDialog { public: enum Resolution { NO_RESOLUTION, diff --git a/toonz/sources/toonz/loadfolderpopup.h b/toonz/sources/toonz/loadfolderpopup.h index 08b6ca3..5b53070 100644 --- a/toonz/sources/toonz/loadfolderpopup.h +++ b/toonz/sources/toonz/loadfolderpopup.h @@ -23,7 +23,7 @@ class DvDirTreeView; \brief Popup widget used to invoke the Load Folder command. */ -class LoadFolderPopup : public DVGui::Dialog { +class LoadFolderPopup final : public DVGui::Dialog { Q_OBJECT public: diff --git a/toonz/sources/toonz/magpiefileimportpopup.h b/toonz/sources/toonz/magpiefileimportpopup.h index 3e59e6f..65a39da 100644 --- a/toonz/sources/toonz/magpiefileimportpopup.h +++ b/toonz/sources/toonz/magpiefileimportpopup.h @@ -35,7 +35,7 @@ public: // MagpieFileImportPopup //----------------------------------------------------------------------------- -class MagpieFileImportPopup : public DVGui::Dialog { +class MagpieFileImportPopup final : public DVGui::Dialog { Q_OBJECT MagpieInfo *m_info; diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 43d33e0..d94290f 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -2151,7 +2151,7 @@ void MainWindow::togglePickStyleLines() { //----------------------------------------------------------------------------- -class ReloadStyle : public MenuItemHandler { +class ReloadStyle final : public MenuItemHandler { public: ReloadStyle() : MenuItemHandler("MI_ReloadStyle") {} void execute() override { diff --git a/toonz/sources/toonz/mainwindow.h b/toonz/sources/toonz/mainwindow.h index b3a4b1c..2b3d8c0 100644 --- a/toonz/sources/toonz/mainwindow.h +++ b/toonz/sources/toonz/mainwindow.h @@ -24,7 +24,7 @@ class ComboViewerPanel; class TopBar; //----------------------------------------------------------------------------- -class Room : public TMainWindow { +class Room final : public TMainWindow { Q_OBJECT TFilePath m_path; @@ -63,7 +63,7 @@ public: //----------------------------------------------------------------------------- -class MainWindow : public QMainWindow { +class MainWindow final : public QMainWindow { Q_OBJECT bool m_saveSettingsOnQuit; diff --git a/toonz/sources/toonz/matchline.cpp b/toonz/sources/toonz/matchline.cpp index 16dd706..8392313 100644 --- a/toonz/sources/toonz/matchline.cpp +++ b/toonz/sources/toonz/matchline.cpp @@ -481,7 +481,7 @@ void MatchlinesDialog::onInkPrevalenceChanged(bool isDragging) { //----------------------------------------------------------------------------- -class DeleteMatchlineUndo : public TUndo { +class DeleteMatchlineUndo final : public TUndo { public: TXshLevel *m_xl; TXshSimpleLevel *m_sl; @@ -555,7 +555,7 @@ public: //----------------------------------------------------------------------------- -class MatchlineUndo : public TUndo { +class MatchlineUndo final : public TUndo { TXshLevelP m_xl; int m_mergeCmappedSessionId; std::map m_images; diff --git a/toonz/sources/toonz/matchline.h b/toonz/sources/toonz/matchline.h index 8560d35..dbefb4d 100644 --- a/toonz/sources/toonz/matchline.h +++ b/toonz/sources/toonz/matchline.h @@ -24,7 +24,7 @@ class TXsheet; //================================================== -class MergeCmappedDialog : public DVGui::Dialog { +class MergeCmappedDialog final : public DVGui::Dialog { Q_OBJECT DVGui::FileField *m_saveInFileFld; @@ -44,7 +44,7 @@ protected slots: //---------------------------------------------------------------- -class MatchlinesDialog : public DVGui::Dialog { +class MatchlinesDialog final : public DVGui::Dialog { Q_OBJECT QRadioButton *m_button1, *m_button2; @@ -78,7 +78,7 @@ public: //---------------------------------------------------------------- -class DeleteInkDialog : public DVGui::Dialog { +class DeleteInkDialog final : public DVGui::Dialog { Q_OBJECT DVGui::LineEdit *m_inkIndex; diff --git a/toonz/sources/toonz/matchlinecommand.cpp b/toonz/sources/toonz/matchlinecommand.cpp index 73d38e6..04f329f 100644 --- a/toonz/sources/toonz/matchlinecommand.cpp +++ b/toonz/sources/toonz/matchlinecommand.cpp @@ -100,7 +100,7 @@ MergeCmappedDialog::MergeCmappedDialog(TFilePath &levelPath) // MergeColumns command //***************************************************************************** -class MergeColumnsCommand : public MenuItemHandler { +class MergeColumnsCommand final : public MenuItemHandler { public: MergeColumnsCommand() : MenuItemHandler(MI_MergeColumns) {} @@ -135,7 +135,7 @@ public: // ApplyMatchlines command //***************************************************************************** -class ApplyMatchlinesCommand : public MenuItemHandler { +class ApplyMatchlinesCommand final : public MenuItemHandler { public: ApplyMatchlinesCommand() : MenuItemHandler(MI_ApplyMatchLines) {} @@ -220,7 +220,7 @@ void doCloneLevelNoSave(const TCellSelection::Range &range, namespace { //----------------------------------------------------------------------------- -class CloneLevelNoSaveUndo : public TUndo { +class CloneLevelNoSaveUndo final : public TUndo { std::map m_createdLevels; std::set m_insertedColumnIndices; @@ -413,7 +413,7 @@ void cloneColumn(const TCellSelection::Range &cells, } // namespace -class MergeCmappedCommand : public MenuItemHandler { +class MergeCmappedCommand final : public MenuItemHandler { public: MergeCmappedCommand() : MenuItemHandler(MI_MergeCmapped) {} void execute() override { @@ -582,7 +582,7 @@ void doDeleteCommand(bool isMatchline) { //----------------------------------------------------------------------------- -class DeleteInkCommand : public MenuItemHandler { +class DeleteInkCommand final : public MenuItemHandler { public: DeleteInkCommand() : MenuItemHandler(MI_DeleteInk) {} void execute() override { doDeleteCommand(false); } @@ -591,7 +591,7 @@ public: //----------------------------------------------------------------------------- -class DeleteMatchlinesCommand : public MenuItemHandler { +class DeleteMatchlinesCommand final : public MenuItemHandler { public: DeleteMatchlinesCommand() : MenuItemHandler(MI_DeleteMatchLines) {} void execute() override { doDeleteCommand(true); } diff --git a/toonz/sources/toonz/menubar.h b/toonz/sources/toonz/menubar.h index 8d6f56e..bb2e3b9 100644 --- a/toonz/sources/toonz/menubar.h +++ b/toonz/sources/toonz/menubar.h @@ -28,7 +28,7 @@ class QXmlStreamReader; //----------------------------------------------------------------------------- -class RoomTabWidget : public QTabBar { +class RoomTabWidget final : public QTabBar { Q_OBJECT int m_clickedTabIndex; @@ -69,7 +69,7 @@ signals: //----------------------------------------------------------------------------- /* -class SubSheetBar : public QFrame +class SubSheetBar final : public QFrame { Q_OBJECT @@ -105,7 +105,7 @@ protected: //----------------------------------------------------------------------------- #ifdef MACOSX -class MenuBarWhiteLine : public QFrame +class MenuBarWhiteLine final : public QFrame { Q_OBJECT public: @@ -114,7 +114,7 @@ protected: void paintEvent(QPaintEvent *event); }; #else -class MenuBarWhiteLine : public QMenuBar +class MenuBarWhiteLine final : public QMenuBar { public: MenuBarWhiteLine(QWidget *parent = 0); @@ -125,7 +125,7 @@ protected: */ //----------------------------------------------------------------------------- -class UrlOpener : public QObject { +class UrlOpener final : public QObject { Q_OBJECT QUrl m_url; @@ -138,7 +138,7 @@ public slots: //----------------------------------------------------------------------------- /*-- モジュールごとにMenubarの内容を切り替える --*/ -class StackedMenuBar : public QStackedWidget { +class StackedMenuBar final : public QStackedWidget { Q_OBJECT QMenuBar *createCleanupMenuBar(); @@ -170,7 +170,7 @@ protected slots: //----------------------------------------------------------------------------- -class TopBar : public QToolBar { +class TopBar final : public QToolBar { Q_OBJECT QFrame *m_containerFrame; diff --git a/toonz/sources/toonz/menubarpopup.cpp b/toonz/sources/toonz/menubarpopup.cpp index 6611e53..06e3828 100644 --- a/toonz/sources/toonz/menubarpopup.cpp +++ b/toonz/sources/toonz/menubarpopup.cpp @@ -37,7 +37,7 @@ // MenuBarCommandItem //----------------------------------------------------------------------------- -class MenuBarCommandItem : public QTreeWidgetItem { +class MenuBarCommandItem final : public QTreeWidgetItem { QAction* m_action; public: @@ -55,7 +55,7 @@ public: // MenuBarSeparatorItem //----------------------------------------------------------------------------- -class MenuBarSeparatorItem : public QTreeWidgetItem { +class MenuBarSeparatorItem final : public QTreeWidgetItem { public: MenuBarSeparatorItem(QTreeWidgetItem* parent) : QTreeWidgetItem(parent, UserType) { @@ -70,7 +70,7 @@ public: // MenuBarSubmenuItem //----------------------------------------------------------------------------- -class MenuBarSubmenuItem : public QTreeWidgetItem { +class MenuBarSubmenuItem final : public QTreeWidgetItem { public: MenuBarSubmenuItem(QTreeWidgetItem* parent, QString& title) : QTreeWidgetItem(parent, UserType) { diff --git a/toonz/sources/toonz/menubarpopup.h b/toonz/sources/toonz/menubarpopup.h index ea79411..5d0a44d 100644 --- a/toonz/sources/toonz/menubarpopup.h +++ b/toonz/sources/toonz/menubarpopup.h @@ -18,7 +18,7 @@ class QXmlStreamWriter; // MenuBarTree //----------------------------------------------------------------------------- -class MenuBarTree : public QTreeWidget { +class MenuBarTree final : public QTreeWidget { Q_OBJECT TFilePath m_path; @@ -45,7 +45,7 @@ protected slots: // CommandListTree //----------------------------------------------------------------------------- -class CommandListTree : public QTreeWidget { +class CommandListTree final : public QTreeWidget { Q_OBJECT void addFolder(const QString& title, int commandType, @@ -62,7 +62,7 @@ protected: // MenuBarPopup //----------------------------------------------------------------------------- -class MenuBarPopup : public DVGui::Dialog { +class MenuBarPopup final : public DVGui::Dialog { Q_OBJECT CommandListTree* m_commandListTree; MenuBarTree* m_menuBarTree; diff --git a/toonz/sources/toonz/mergecmapped.cpp b/toonz/sources/toonz/mergecmapped.cpp index a3019a1..defc15a 100644 --- a/toonz/sources/toonz/mergecmapped.cpp +++ b/toonz/sources/toonz/mergecmapped.cpp @@ -217,7 +217,7 @@ void applyDeleteMatchline(TXshSimpleLevel *sl, } // namespace //----------------------------------------------------------------------------- -class DeleteMatchlineUndo : public TUndo { +class DeleteMatchlineUndo final : public TUndo { public: TXshLevel *m_xl; TXshSimpleLevel *m_sl; @@ -295,7 +295,7 @@ public: /* namespace { -class DeleteLevelUndo : public TUndo { +class DeleteLevelUndo final : public TUndo { TXshLevelP m_xl; public: DeleteLevelUndo(TXshLevel *xl) : m_xl(xl) {} @@ -338,7 +338,7 @@ bool removeLevel(TXshLevel *level) { return true; } -class MergeCmappedUndo : public TUndo { +class MergeCmappedUndo final : public TUndo { TXshLevel *m_xl; int m_mergeCmappedSessionId; std::map m_images; diff --git a/toonz/sources/toonz/mergecolumns.cpp b/toonz/sources/toonz/mergecolumns.cpp index dd55f16..027e8d0 100644 --- a/toonz/sources/toonz/mergecolumns.cpp +++ b/toonz/sources/toonz/mergecolumns.cpp @@ -176,7 +176,7 @@ void mergeVectorColumns(const std::vector &matchingLevels) { } // namespace //----------------------------------------------------------------------------- -class MergeColumnsUndo : public TUndo { +class MergeColumnsUndo final : public TUndo { TXshLevelP m_xl; int m_matchlineSessionId; std::map m_images; diff --git a/toonz/sources/toonz/meshifypopup.cpp b/toonz/sources/toonz/meshifypopup.cpp index 5f3261c..bf51ea7 100644 --- a/toonz/sources/toonz/meshifypopup.cpp +++ b/toonz/sources/toonz/meshifypopup.cpp @@ -493,7 +493,7 @@ void getRaster(const TXsheet *xsh, int row, TRasterP &ras, TPointD &rasDpi, // MeshifyPopup::Swatch definition //******************************************************************************************** -class MeshifyPopup::Swatch : public PlaneViewer { +class MeshifyPopup::Swatch final : public PlaneViewer { public: TImageP m_img; //!< The eventual image to be meshified @@ -1306,7 +1306,7 @@ bool meshifySelection(const MeshifyOptions &options) { // Meshify Command definition //******************************************************************************************** -class MeshifyCommand : public MenuItemHandler { +class MeshifyCommand final : public MenuItemHandler { public: MeshifyCommand() : MenuItemHandler("A_ToolOption_Meshify") {} diff --git a/toonz/sources/toonz/meshifypopup.h b/toonz/sources/toonz/meshifypopup.h index b84daf8..0c1388a 100644 --- a/toonz/sources/toonz/meshifypopup.h +++ b/toonz/sources/toonz/meshifypopup.h @@ -38,7 +38,7 @@ class QPushButton; Plastic Tool. */ -class MeshifyPopup : public DVGui::Dialog { +class MeshifyPopup final : public DVGui::Dialog { Q_OBJECT public: diff --git a/toonz/sources/toonz/messagepanel.cpp b/toonz/sources/toonz/messagepanel.cpp index 09e743d..7f0abd6 100644 --- a/toonz/sources/toonz/messagepanel.cpp +++ b/toonz/sources/toonz/messagepanel.cpp @@ -16,7 +16,7 @@ // Centered Text Widget class //---------------------------------- -class CenteredTextWidget : public QWidget { +class CenteredTextWidget final : public QWidget { QString m_text; public: @@ -158,7 +158,7 @@ void LogPanel::clear() { //============================================================================= // OpenFloatingLogPanel -class OpenFloatingLogPanel : public MenuItemHandler { +class OpenFloatingLogPanel final : public MenuItemHandler { public: OpenFloatingLogPanel() : MenuItemHandler(MI_OpenMessage) {} void execute() override { diff --git a/toonz/sources/toonz/messagepanel.h b/toonz/sources/toonz/messagepanel.h index 5785a13..4cbe763 100644 --- a/toonz/sources/toonz/messagepanel.h +++ b/toonz/sources/toonz/messagepanel.h @@ -16,7 +16,7 @@ class MainWindow; // MessagePanel //----------------------------------------------------------------------------- -class MessagePanel : public TPanel { +class MessagePanel final : public TPanel { friend class MainWindow; CenteredTextWidget *m_messageBox; @@ -45,7 +45,7 @@ private: // MessagePanel //----------------------------------------------------------------------------- -class LogPanel : public TPanel, public TLogger::Listener { +class LogPanel final : public TPanel, public TLogger::Listener { Q_OBJECT QTextEdit *m_messageBox; diff --git a/toonz/sources/toonz/moviegenerator.cpp b/toonz/sources/toonz/moviegenerator.cpp index cd3d53f..9897829 100644 --- a/toonz/sources/toonz/moviegenerator.cpp +++ b/toonz/sources/toonz/moviegenerator.cpp @@ -105,7 +105,7 @@ public: // il canale di trasparenza (se la proprieta' booleana Alpha Channel esiste // e vale true, oppure la "Resolution" vale L"32 bits" // -class AlphaChecker : public TProperty::Visitor { +class AlphaChecker final : public TProperty::Visitor { bool m_alphaEnabled; public: @@ -128,7 +128,7 @@ public: // RasterMovieGenerator ( animazioni raster) //----------------------------------------------------------------------------- -class RasterMovieGenerator : public MovieGenerator::Imp { +class RasterMovieGenerator final : public MovieGenerator::Imp { public: bool m_isFrames; TLevelWriterP m_lw; @@ -304,7 +304,7 @@ false,0); // FlashStagePainter //----------------------------------------------------------------------------- -class FlashStagePainter : public Stage::Visitor { +class FlashStagePainter final : public Stage::Visitor { TFlash &m_flash; TAffine m_cameraAff; TPixel32 m_bgColor; @@ -346,7 +346,7 @@ public: // FlashMovieGenerator //----------------------------------------------------------------------------- -class FlashMovieGenerator : public MovieGenerator::Imp { +class FlashMovieGenerator final : public MovieGenerator::Imp { public: TFlash m_flash; TAffine m_viewAff; diff --git a/toonz/sources/toonz/onionskinmaskgui.h b/toonz/sources/toonz/onionskinmaskgui.h index 71f435e..bbe0d3b 100644 --- a/toonz/sources/toonz/onionskinmaskgui.h +++ b/toonz/sources/toonz/onionskinmaskgui.h @@ -19,7 +19,7 @@ void addOnionSkinCommand(QMenu *, bool isFilmStrip = false); // OnionSkinSwitcher //----------------------------------------------------------------------------- -class OnionSkinSwitcher : public QObject { +class OnionSkinSwitcher final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/toonz/outputsettingspopup.h b/toonz/sources/toonz/outputsettingspopup.h index 3a1ee97..e737da5 100644 --- a/toonz/sources/toonz/outputsettingspopup.h +++ b/toonz/sources/toonz/outputsettingspopup.h @@ -97,7 +97,7 @@ protected slots: void onFrameRateEditingFinished(); }; -class PreviewSettingsPopup : public OutputSettingsPopup { +class PreviewSettingsPopup final : public OutputSettingsPopup { public: PreviewSettingsPopup() : OutputSettingsPopup(true) {} }; diff --git a/toonz/sources/toonz/overwritepopup.h b/toonz/sources/toonz/overwritepopup.h index 0ee9625..0c16f6c 100644 --- a/toonz/sources/toonz/overwritepopup.h +++ b/toonz/sources/toonz/overwritepopup.h @@ -40,7 +40,7 @@ class QPushButton; Additionally, the dialog could be \t CANCELED, either by closing it or pressing the "Cancel" button. */ -class OverwriteDialog : public DVGui::Dialog { +class OverwriteDialog final : public DVGui::Dialog { Q_OBJECT public: @@ -59,7 +59,7 @@ public: virtual bool operator()(const TFilePath &fp) const = 0; }; - struct DecodeFileExistsFunc : public ExistsFunc { + struct DecodeFileExistsFunc final : public ExistsFunc { ToonzScene *m_scene; DecodeFileExistsFunc(ToonzScene *scene) : m_scene(scene) {} diff --git a/toonz/sources/toonz/pane.h b/toonz/sources/toonz/pane.h index 62934ac..253f4c6 100644 --- a/toonz/sources/toonz/pane.h +++ b/toonz/sources/toonz/pane.h @@ -53,7 +53,7 @@ signals: * context menu */ -class TPanelTitleBarButtonForSafeArea : public TPanelTitleBarButton { +class TPanelTitleBarButtonForSafeArea final : public TPanelTitleBarButton { Q_OBJECT public: TPanelTitleBarButtonForSafeArea(QWidget *parent, @@ -74,7 +74,7 @@ protected slots: //----------------------------------------------------------------------------- //! a buttonset can group different TPanelTitleBarButton -class TPanelTitleBarButtonSet : public QObject { +class TPanelTitleBarButtonSet final : public QObject { Q_OBJECT std::vector m_buttons; @@ -92,7 +92,7 @@ signals: //----------------------------------------------------------------------------- -class TPanelTitleBar : public QFrame { +class TPanelTitleBar final : public QFrame { Q_OBJECT bool m_isActive; diff --git a/toonz/sources/toonz/pltgizmopopup.cpp b/toonz/sources/toonz/pltgizmopopup.cpp index d150b17..b1e3076 100644 --- a/toonz/sources/toonz/pltgizmopopup.cpp +++ b/toonz/sources/toonz/pltgizmopopup.cpp @@ -68,7 +68,7 @@ void getStyleIds(std::vector &styleIds, const TStyleSelection &selection) { // GizmoUndo //----------------------------------------------------------------------------- -class GizmoUndo : public TUndo { +class GizmoUndo final : public TUndo { TStyleSelection m_selection; std::vector m_oldColors, m_newColors; diff --git a/toonz/sources/toonz/pltgizmopopup.h b/toonz/sources/toonz/pltgizmopopup.h index b971d26..2f4528e 100644 --- a/toonz/sources/toonz/pltgizmopopup.h +++ b/toonz/sources/toonz/pltgizmopopup.h @@ -12,7 +12,7 @@ // ValueAdjuster //----------------------------------------------------------------------------- -class ValueAdjuster : public QWidget { +class ValueAdjuster final : public QWidget { Q_OBJECT DVGui::DoubleLineEdit *m_valueLineEdit; @@ -37,7 +37,7 @@ signals: // ValueShifter //----------------------------------------------------------------------------- -class ValueShifter : public QWidget { +class ValueShifter final : public QWidget { Q_OBJECT DVGui::DoubleLineEdit *m_valueLineEdit; @@ -64,7 +64,7 @@ signals: // TODO: spostare il colorfield qui dentro -class ColorFader : public QWidget { +class ColorFader final : public QWidget { Q_OBJECT DVGui::DoubleLineEdit *m_valueLineEdit; @@ -88,7 +88,7 @@ signals: // PltGizmoPopup //----------------------------------------------------------------------------- -class PltGizmoPopup : public DVGui::Dialog { +class PltGizmoPopup final : public DVGui::Dialog { Q_OBJECT DVGui::ColorField *m_colorFld; diff --git a/toonz/sources/toonz/preferencespopup.h b/toonz/sources/toonz/preferencespopup.h index e508e13..4fd3d15 100644 --- a/toonz/sources/toonz/preferencespopup.h +++ b/toonz/sources/toonz/preferencespopup.h @@ -30,7 +30,7 @@ class QLabel; // PreferencesPopup definition //********************************************************************************** -class PreferencesPopup : public QDialog { +class PreferencesPopup final : public QDialog { Q_OBJECT public: @@ -151,7 +151,7 @@ private slots: // PreferencesPopup::FormatProperties definition //********************************************************************************** -class PreferencesPopup::FormatProperties : public DVGui::Dialog { +class PreferencesPopup::FormatProperties final : public DVGui::Dialog { Q_OBJECT public: diff --git a/toonz/sources/toonz/previewer.cpp b/toonz/sources/toonz/previewer.cpp index 79482ec..bcc3d8a 100644 --- a/toonz/sources/toonz/previewer.cpp +++ b/toonz/sources/toonz/previewer.cpp @@ -126,7 +126,7 @@ inline bool contains(const QRegion ®ion, const TRect &rect) { // Previewer::Imp //----------------------- -class Previewer::Imp : public TRenderPort { +class Previewer::Imp final : public TRenderPort { public: // All useful infos about a frame under Previewer's management struct FrameInfo { @@ -768,7 +768,7 @@ static DVGui::ProgressDialog *Pd = 0; //----------------------------------------------------------------------------- -class ProgressBarMessager : public TThread::Message { +class ProgressBarMessager final : public TThread::Message { public: int m_choice; int m_val; @@ -814,7 +814,7 @@ public: //----------------------------------------------------------------------------- -class SavePreviewedPopup : public FileBrowserPopup { +class SavePreviewedPopup final : public FileBrowserPopup { Previewer *m_p; public: diff --git a/toonz/sources/toonz/previewer.h b/toonz/sources/toonz/previewer.h index 9753f30..566d77b 100644 --- a/toonz/sources/toonz/previewer.h +++ b/toonz/sources/toonz/previewer.h @@ -28,7 +28,7 @@ class TFilePath; // Previewer //----------------------------------------------------------------------------- -class Previewer : public QObject, public TFxObserver { +class Previewer final : public QObject, public TFxObserver { Q_OBJECT class Imp; diff --git a/toonz/sources/toonz/previewfxmanager.cpp b/toonz/sources/toonz/previewfxmanager.cpp index 0e07189..ae01623 100644 --- a/toonz/sources/toonz/previewfxmanager.cpp +++ b/toonz/sources/toonz/previewfxmanager.cpp @@ -142,7 +142,7 @@ inline void adaptView(FlipBook *flipbook, TDimension cameraSize) { //! This class receives and handles notifications from a TRenderer executing the //! preview fx //! rendering job. -class PreviewFxRenderPort : public QObject, public TRenderPort { +class PreviewFxRenderPort final : public QObject, public TRenderPort { PreviewFxInstance *m_owner; public: diff --git a/toonz/sources/toonz/previewfxmanager.h b/toonz/sources/toonz/previewfxmanager.h index 0c5ff4f..5a1f2c1 100644 --- a/toonz/sources/toonz/previewfxmanager.h +++ b/toonz/sources/toonz/previewfxmanager.h @@ -55,7 +55,7 @@ or the whole scene's fxs. \sa FlipBook, TXshLevelHandle, TFxHandle, TXsheetHandle classes. */ -class PreviewFxManager : public QObject { +class PreviewFxManager final : public QObject { Q_OBJECT TThread::Mutex m_mutex; diff --git a/toonz/sources/toonz/print.cpp b/toonz/sources/toonz/print.cpp index 5810bd7..d287109 100644 --- a/toonz/sources/toonz/print.cpp +++ b/toonz/sources/toonz/print.cpp @@ -66,7 +66,7 @@ void printCurrentFrame() { //============================================================================= -class PrintCommand : public MenuItemHandler { +class PrintCommand final : public MenuItemHandler { public: PrintCommand() : MenuItemHandler(MI_Print) {} void execute() override { diff --git a/toonz/sources/toonz/projectpopup.h b/toonz/sources/toonz/projectpopup.h index 2484c96..782d176 100644 --- a/toonz/sources/toonz/projectpopup.h +++ b/toonz/sources/toonz/projectpopup.h @@ -21,7 +21,7 @@ class QComboBox; //============================================================================= // ProjectDvDirModelRootNode -class ProjectDvDirModelRootNode : public DvDirModelNode { +class ProjectDvDirModelRootNode final : public DvDirModelNode { public: ProjectDvDirModelRootNode(); void refreshChildren() override; @@ -45,7 +45,7 @@ public: //============================================================================= // ProjectDvDirModelSpecialFileFolderNode -class ProjectDvDirModelSpecialFileFolderNode +class ProjectDvDirModelSpecialFileFolderNode final : public ProjectDvDirModelFileFolderNode { QPixmap m_pixmap; @@ -61,7 +61,8 @@ public: //============================================================================= // ProjectDvDirModelProjectNode -class ProjectDvDirModelProjectNode : public ProjectDvDirModelFileFolderNode { +class ProjectDvDirModelProjectNode final + : public ProjectDvDirModelFileFolderNode { public: ProjectDvDirModelProjectNode(DvDirModelNode *parent, const TFilePath &path) : ProjectDvDirModelFileFolderNode(parent, path) {} @@ -72,7 +73,7 @@ public: //============================================================================= // ProjectDirModel -class ProjectDirModel : public QAbstractItemModel { +class ProjectDirModel final : public QAbstractItemModel { DvDirModelNode *m_root; public: @@ -137,7 +138,7 @@ protected: // ProjectSettingsPopup //----------------------------------------------------------------------------- -class ProjectSettingsPopup : public ProjectPopup { +class ProjectSettingsPopup final : public ProjectPopup { Q_OBJECT public: @@ -154,7 +155,7 @@ public slots: // ProjectCreatePopup //----------------------------------------------------------------------------- -class ProjectCreatePopup : public ProjectPopup { +class ProjectCreatePopup final : public ProjectPopup { Q_OBJECT public: diff --git a/toonz/sources/toonz/psdsettingspopup.h b/toonz/sources/toonz/psdsettingspopup.h index 02afbec..1b3a7a1 100644 --- a/toonz/sources/toonz/psdsettingspopup.h +++ b/toonz/sources/toonz/psdsettingspopup.h @@ -23,15 +23,16 @@ class CheckBox; // PsdSettingsPopup //----------------------------------------------------------------------------- -class PsdSettingsPopup : public DVGui::Dialog { +class PsdSettingsPopup final : public DVGui::Dialog { Q_OBJECT // Loading Mode // FLAT: psd flat image // FRAMES: all psd layers are frames of a single Tlevel // COLUMNS: each psd layer is a TLevel with only one frame. // FOLDER: each psd layer is a TLevel and - // each psd folder is a TLevel where each psd layer - //contained + // each psd folder is a TLevel where each psd + // layer + // contained // into folder is a frame of TLevel enum Mode { FLAT, FRAMES, COLUMNS, FOLDER }; diff --git a/toonz/sources/toonz/rendercommand.cpp b/toonz/sources/toonz/rendercommand.cpp index 72e047c..1171ddb 100644 --- a/toonz/sources/toonz/rendercommand.cpp +++ b/toonz/sources/toonz/rendercommand.cpp @@ -99,7 +99,7 @@ TRaster32P loadLight() { //========================================================= -class OnRenderCompleted : public TThread::Message { +class OnRenderCompleted final : public TThread::Message { TFilePath m_fp; bool m_error; @@ -378,14 +378,14 @@ void RenderCommand::flashRender() { //=================================================================== -class RenderListener : public DVGui::ProgressDialog, - public MovieRenderer::Listener { +class RenderListener final : public DVGui::ProgressDialog, + public MovieRenderer::Listener { QString m_progressBarString; int m_frameCounter; TRenderer *m_renderer; bool m_error; - class Message : public TThread::Message { + class Message final : public TThread::Message { RenderListener *m_pb; int m_frame; QString m_labelText; @@ -595,8 +595,8 @@ void RenderCommand::resetBgColor() { //=================================================================== -class MultimediaProgressBar : public DVGui::ProgressDialog, - public MultimediaRenderer::Listener { +class MultimediaProgressBar final : public DVGui::ProgressDialog, + public MultimediaRenderer::Listener { QString m_progressBarString; int m_frameCounter; int m_columnCounter; @@ -605,7 +605,7 @@ class MultimediaProgressBar : public DVGui::ProgressDialog, //---------------------------------------------------------- - class Message : public TThread::Message { + class Message final : public TThread::Message { MultimediaProgressBar *m_pb; int m_frame; int m_column; diff --git a/toonz/sources/toonz/renumberpopup.h b/toonz/sources/toonz/renumberpopup.h index 53ba86a..9d30ef8 100644 --- a/toonz/sources/toonz/renumberpopup.h +++ b/toonz/sources/toonz/renumberpopup.h @@ -14,7 +14,7 @@ class QPushButton; // RenumberPopup //----------------------------------------------------------------------------- -class RenumberPopup : public DVGui::Dialog { +class RenumberPopup final : public DVGui::Dialog { Q_OBJECT QPushButton *m_okBtn; diff --git a/toonz/sources/toonz/reslist.h b/toonz/sources/toonz/reslist.h index c85c558..7f71838 100644 --- a/toonz/sources/toonz/reslist.h +++ b/toonz/sources/toonz/reslist.h @@ -27,7 +27,7 @@ files as well. */ -class ResListManager : public QObject { +class ResListManager final : public QObject { Q_OBJECT public: diff --git a/toonz/sources/toonz/ruler.h b/toonz/sources/toonz/ruler.h index 3065ce8..114f37b 100644 --- a/toonz/sources/toonz/ruler.h +++ b/toonz/sources/toonz/ruler.h @@ -16,7 +16,7 @@ class SceneViewer; /*! La classe si occupa della visualizzazione e della gestione di una linea guida (puo' essere orizzontale o verticale) */ -class Ruler : public QWidget { +class Ruler final : public QWidget { Q_OBJECT QColor m_parentBgColor; diff --git a/toonz/sources/toonz/runscriptcommand.cpp b/toonz/sources/toonz/runscriptcommand.cpp index 89fba7a..e32b189 100644 --- a/toonz/sources/toonz/runscriptcommand.cpp +++ b/toonz/sources/toonz/runscriptcommand.cpp @@ -17,7 +17,7 @@ #include -class RunScriptCommand : public MenuItemHandler { +class RunScriptCommand final : public MenuItemHandler { public: RunScriptCommand() : MenuItemHandler("MI_RunScript") {} void execute() override; diff --git a/toonz/sources/toonz/savepresetpopup.h b/toonz/sources/toonz/savepresetpopup.h index c2bcfd9..b2b0617 100644 --- a/toonz/sources/toonz/savepresetpopup.h +++ b/toonz/sources/toonz/savepresetpopup.h @@ -10,7 +10,7 @@ // SavePresetPopup //----------------------------------------------------------------------------- -class SavePresetPopup : public DVGui::Dialog { +class SavePresetPopup final : public DVGui::Dialog { Q_OBJECT DVGui::LineEdit *m_nameFld; diff --git a/toonz/sources/toonz/scanpopup.cpp b/toonz/sources/toonz/scanpopup.cpp index 483a71b..718232c 100644 --- a/toonz/sources/toonz/scanpopup.cpp +++ b/toonz/sources/toonz/scanpopup.cpp @@ -876,7 +876,7 @@ OpenPopupCommandHandler openScanSettingsPopup( OpenPopupCommandHandler openAutocenterPopup(MI_Autocenter); #endif -class ScanCommand : public MenuItemHandler { +class ScanCommand final : public MenuItemHandler { public: ScanCommand() : MenuItemHandler("MI_Scan") {} void execute() override { doScan(); } @@ -888,7 +888,7 @@ public: // //========================================================================================= -class SetCropboxCommand : public MenuItemHandler { +class SetCropboxCommand final : public MenuItemHandler { TTool *m_currentTool; public: @@ -957,7 +957,7 @@ public: // //========================================================================================= -class ResetCropboxCommand : public MenuItemHandler { +class ResetCropboxCommand final : public MenuItemHandler { public: ResetCropboxCommand() : MenuItemHandler("MI_ResetScanCropbox") {} @@ -977,7 +977,7 @@ public: // //========================================================================================= -class SetScanCropboxTool : public TTool { +class SetScanCropboxTool final : public TTool { const std::string m_imgId; TScannerParameters *m_parameters; int m_scaling; diff --git a/toonz/sources/toonz/scanpopup.h b/toonz/sources/toonz/scanpopup.h index 58b40b4..aa133cc 100644 --- a/toonz/sources/toonz/scanpopup.h +++ b/toonz/sources/toonz/scanpopup.h @@ -21,7 +21,7 @@ class ProgressDialog; // MyScannerListener //----------------------------------------------------------------------------- -class MyScannerListener : public QObject, public TScannerListener { +class MyScannerListener final : public QObject, public TScannerListener { Q_OBJECT int m_current; @@ -46,7 +46,7 @@ protected slots: // DefineScannerPopup //----------------------------------------------------------------------------- -class DefineScannerPopup : public DVGui::Dialog { +class DefineScannerPopup final : public DVGui::Dialog { Q_OBJECT QComboBox *m_scanDriverOm; @@ -61,7 +61,7 @@ public slots: // ScanSettingsPopup //----------------------------------------------------------------------------- -class ScanSettingsPopup : public DVGui::Dialog { +class ScanSettingsPopup final : public DVGui::Dialog { Q_OBJECT QLabel *m_scannerNameLbl; DVGui::CheckBox *m_reverseOrderCB; @@ -99,7 +99,7 @@ public slots: // AutocenterPopup //----------------------------------------------------------------------------- -class AutocenterPopup : public DVGui::Dialog { +class AutocenterPopup final : public DVGui::Dialog { Q_OBJECT DVGui::CheckBox *m_autocenter; QComboBox *m_pegbarHoles; diff --git a/toonz/sources/toonz/scenesettingspopup.cpp b/toonz/sources/toonz/scenesettingspopup.cpp index 2f30e79..d3c7ba7 100644 --- a/toonz/sources/toonz/scenesettingspopup.cpp +++ b/toonz/sources/toonz/scenesettingspopup.cpp @@ -49,7 +49,7 @@ const int labelSize = 110; //----------------------------------------------------------------------------- /* -class CheckBoardRect : public QWidget +class CheckBoardRect final : public QWidget { TRaster32P m_ras; diff --git a/toonz/sources/toonz/scenesettingspopup.h b/toonz/sources/toonz/scenesettingspopup.h index 801d0b9..1160f13 100644 --- a/toonz/sources/toonz/scenesettingspopup.h +++ b/toonz/sources/toonz/scenesettingspopup.h @@ -17,7 +17,7 @@ class QComboBox; // SceneSettingsPopup //----------------------------------------------------------------------------- -class SceneSettingsPopup : public QDialog { +class SceneSettingsPopup final : public QDialog { Q_OBJECT DVGui::DoubleLineEdit *m_frameRateFld; diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp index 7e0b9e9..ff7c79f 100644 --- a/toonz/sources/toonz/sceneviewer.cpp +++ b/toonz/sources/toonz/sceneviewer.cpp @@ -96,7 +96,7 @@ std::set //------------------------------------------------------------------------------- QGLWidget *touchProxy() { - struct GLWidgetProxy : public TGLDisplayListsProxy { + struct GLWidgetProxy final : public TGLDisplayListsProxy { ~GLWidgetProxy() { delete l_proxy; l_proxy = 0; @@ -318,7 +318,7 @@ void executeCheck(int checkType) { //----------------------------------------------------------------------------- -class TCheckToggleCommand : public MenuItemHandler { +class TCheckToggleCommand final : public MenuItemHandler { public: TCheckToggleCommand() : MenuItemHandler("MI_TCheck") {} void execute() override { executeCheck(ToonzCheck::eTransparency); } @@ -326,7 +326,7 @@ public: //----------------------------------------------------------------------------- -class ICheckToggleCommand : public MenuItemHandler { +class ICheckToggleCommand final : public MenuItemHandler { public: ICheckToggleCommand() : MenuItemHandler("MI_ICheck") {} void execute() override { executeCheck(ToonzCheck::eInk); } @@ -334,7 +334,7 @@ public: //----------------------------------------------------------------------------- -class PCheckToggleCommand : public MenuItemHandler { +class PCheckToggleCommand final : public MenuItemHandler { public: PCheckToggleCommand() : MenuItemHandler("MI_PCheck") {} void execute() override { executeCheck(ToonzCheck::ePaint); } @@ -342,7 +342,7 @@ public: //----------------------------------------------------------------------------- -class BCheckToggleCommand : public MenuItemHandler { +class BCheckToggleCommand final : public MenuItemHandler { public: BCheckToggleCommand() : MenuItemHandler("MI_BCheck") {} void execute() override { executeCheck(ToonzCheck::eBlackBg); } @@ -350,7 +350,7 @@ public: //----------------------------------------------------------------------------- -class TAutocloseToggleCommand : public MenuItemHandler { +class TAutocloseToggleCommand final : public MenuItemHandler { public: TAutocloseToggleCommand() : MenuItemHandler("MI_ACheck") {} void execute() override { executeCheck(ToonzCheck::eAutoclose); } @@ -358,7 +358,7 @@ public: //----------------------------------------------------------------------------- -class TGapToggleCommand : public MenuItemHandler { +class TGapToggleCommand final : public MenuItemHandler { public: TGapToggleCommand() : MenuItemHandler("MI_GCheck") {} void execute() override { executeCheck(ToonzCheck::eGap); } @@ -366,7 +366,7 @@ public: //----------------------------------------------------------------------------- -class TInksOnlyToggleCommand : public MenuItemHandler { +class TInksOnlyToggleCommand final : public MenuItemHandler { public: TInksOnlyToggleCommand() : MenuItemHandler("MI_IOnly") {} void execute() override { executeCheck(ToonzCheck::eInksOnly); } @@ -375,7 +375,7 @@ public: //----------------------------------------------------------------------------- /*! emphasize lines with style#1 regardless of the current style */ -class Ink1CheckToggleCommand : public MenuItemHandler { +class Ink1CheckToggleCommand final : public MenuItemHandler { public: Ink1CheckToggleCommand() : MenuItemHandler("MI_Ink1Check") {} void execute() override { executeCheck(ToonzCheck::eInk1); } @@ -383,7 +383,7 @@ public: //============================================================================= -class TShiftTraceToggleCommand : public MenuItemHandler { +class TShiftTraceToggleCommand final : public MenuItemHandler { CommandId m_cmdId; public: @@ -440,7 +440,7 @@ public: TShiftTraceToggleCommand shiftTraceToggleCommand(MI_ShiftTrace), editShiftToggleCommand(MI_EditShift), noShiftToggleCommand(MI_NoShift); -class TResetShiftTraceCommand : public MenuItemHandler { +class TResetShiftTraceCommand final : public MenuItemHandler { public: TResetShiftTraceCommand() : MenuItemHandler(MI_ResetShift) {} void execute() override { @@ -1401,7 +1401,7 @@ void drawFpsGraph(int t0, int t1) { //----------------------------------------------------------------------------- -class Qt_GLContextManager : public TGLContextManager { +class Qt_GLContextManager final : public TGLContextManager { QGLContext *m_context; public: diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h index c1c34f9..8923fbe 100644 --- a/toonz/sources/toonz/sceneviewer.h +++ b/toonz/sources/toonz/sceneviewer.h @@ -40,7 +40,7 @@ class FullScreenWidget; //===================================================================== -class ToggleCommandHandler : public MenuItemHandler { +class ToggleCommandHandler final : public MenuItemHandler { int m_status; public: @@ -56,9 +56,9 @@ public: // SceneViewer //----------------------------------------------------------------------------- -class SceneViewer : public QGLWidget, - public TTool::Viewer, - public Previewer::Listener { +class SceneViewer final : public QGLWidget, + public TTool::Viewer, + public Previewer::Listener { Q_OBJECT qreal m_pressure; diff --git a/toonz/sources/toonz/sceneviewercontextmenu.h b/toonz/sources/toonz/sceneviewercontextmenu.h index ce656a4..8d58e81 100644 --- a/toonz/sources/toonz/sceneviewercontextmenu.h +++ b/toonz/sources/toonz/sceneviewercontextmenu.h @@ -10,7 +10,7 @@ class TStageObjectId; class SceneViewer; class TXshColumn; -class SceneViewerContextMenu : public QMenu { +class SceneViewerContextMenu final : public QMenu { Q_OBJECT SceneViewer *m_viewer; int m_groupIndexToBeEntered; diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp index 22cd34d..4eb457b 100644 --- a/toonz/sources/toonz/sceneviewerevents.cpp +++ b/toonz/sources/toonz/sceneviewerevents.cpp @@ -656,7 +656,7 @@ break; //----------------------------------------------------------------------------- -class ViewerZoomer : public ImageUtils::ShortcutZoomer { +class ViewerZoomer final : public ImageUtils::ShortcutZoomer { public: ViewerZoomer(SceneViewer *parent) : ShortcutZoomer(parent) {} diff --git a/toonz/sources/toonz/scriptconsolepanel.h b/toonz/sources/toonz/scriptconsolepanel.h index 7023452..9876039 100644 --- a/toonz/sources/toonz/scriptconsolepanel.h +++ b/toonz/sources/toonz/scriptconsolepanel.h @@ -7,7 +7,7 @@ class ScriptConsole; -class ScriptConsolePanel : public TPanel { +class ScriptConsolePanel final : public TPanel { Q_OBJECT ScriptConsole *m_scriptConsole; diff --git a/toonz/sources/toonz/shifttracetool.cpp b/toonz/sources/toonz/shifttracetool.cpp index e21b0ff..db740eb 100644 --- a/toonz/sources/toonz/shifttracetool.cpp +++ b/toonz/sources/toonz/shifttracetool.cpp @@ -44,7 +44,7 @@ bool circumCenter(TPointD &out, const TPointD &a, const TPointD &b, //============================================================================= -class ShiftTraceTool : public TTool { +class ShiftTraceTool final : public TTool { public: enum CurveStatus { NoCurve, diff --git a/toonz/sources/toonz/shortcutpopup.cpp b/toonz/sources/toonz/shortcutpopup.cpp index 0b0f8a6..d3e7b01 100644 --- a/toonz/sources/toonz/shortcutpopup.cpp +++ b/toonz/sources/toonz/shortcutpopup.cpp @@ -33,7 +33,7 @@ // ogni ShortcutItem rappresenta una QAction (e relativo Shortcut) //----------------------------------------------------------------------------- -class ShortcutItem : public QTreeWidgetItem { +class ShortcutItem final : public QTreeWidgetItem { QAction *m_action; public: diff --git a/toonz/sources/toonz/shortcutpopup.h b/toonz/sources/toonz/shortcutpopup.h index b4e8e60..eaa06e1 100644 --- a/toonz/sources/toonz/shortcutpopup.h +++ b/toonz/sources/toonz/shortcutpopup.h @@ -21,7 +21,7 @@ class ShortcutItem; // Per cancellarlo bisogna chiamare removeShortcut() //----------------------------------------------------------------------------- -class ShortcutViewer : public QWidget { +class ShortcutViewer final : public QWidget { Q_OBJECT QAction *m_action; @@ -51,7 +51,7 @@ signals: // Serve per selezionare la QAction corrente //----------------------------------------------------------------------------- -class ShortcutTree : public QTreeWidget { +class ShortcutTree final : public QTreeWidget { Q_OBJECT std::vector m_items; @@ -80,7 +80,7 @@ signals: // Questo e' il popup che l'utente utilizza per modificare gli shortcut //----------------------------------------------------------------------------- -class ShortcutPopup : public DVGui::Dialog { +class ShortcutPopup final : public DVGui::Dialog { Q_OBJECT QPushButton *m_removeBtn; ShortcutViewer *m_sViewer; diff --git a/toonz/sources/toonz/subcameramanager.h b/toonz/sources/toonz/subcameramanager.h index f8eaf50..e77e9d5 100644 --- a/toonz/sources/toonz/subcameramanager.h +++ b/toonz/sources/toonz/subcameramanager.h @@ -55,7 +55,7 @@ public: // PreviewSubCameraManager //-------------------------------- -class PreviewSubCameraManager : public SceneViewerInteractiveGadget { +class PreviewSubCameraManager final : public SceneViewerInteractiveGadget { TRect m_editingInterestRect; UCHAR m_dragType; bool m_clickAndDrag; diff --git a/toonz/sources/toonz/subscenecommand.cpp b/toonz/sources/toonz/subscenecommand.cpp index e1a7fc6..07ab17f 100644 --- a/toonz/sources/toonz/subscenecommand.cpp +++ b/toonz/sources/toonz/subscenecommand.cpp @@ -895,7 +895,7 @@ set explode(TXsheet *xsh, TXsheet *subXsh, int index, // OpenChildUndo //----------------------------------------------------------------------------- -class OpenChildUndo : public TUndo { +class OpenChildUndo final : public TUndo { int m_row, m_col; public: @@ -931,7 +931,7 @@ public: // CloseChildUndo //----------------------------------------------------------------------------- -class CloseChildUndo : public TUndo { +class CloseChildUndo final : public TUndo { std::vector> m_cells; public: @@ -1532,7 +1532,7 @@ public: // CollapseFxUndo //----------------------------------------------------------------------------- -class CollapseFxUndo : public CollapseUndo { +class CollapseFxUndo final : public CollapseUndo { set m_fxs; QMap m_fxConnections; @@ -1624,7 +1624,7 @@ public: // ExplodeChildUndoRemovingColumn //----------------------------------------------------------------------------- -class ExplodeChildUndoRemovingColumn : public TUndo { +class ExplodeChildUndoRemovingColumn final : public TUndo { std::set m_newIndexs; int m_index; StageObjectsData *m_oldData; @@ -1914,7 +1914,7 @@ public: // ExplodeChildUndo //----------------------------------------------------------------------------- -class ExplodeChildUndoWithoutRemovingColumn : public TUndo { +class ExplodeChildUndoWithoutRemovingColumn final : public TUndo { std::set m_newIndexs; int m_index, m_from, m_to; @@ -2098,7 +2098,7 @@ public: // OpenChildCommand //----------------------------------------------------------------------------- -class OpenChildCommand : public MenuItemHandler { +class OpenChildCommand final : public MenuItemHandler { public: OpenChildCommand() : MenuItemHandler(MI_OpenChild) {} void execute() override { openSubXsheet(); } @@ -2108,7 +2108,7 @@ public: // CloseChildCommand //----------------------------------------------------------------------------- -class CloseChildCommand : public MenuItemHandler { +class CloseChildCommand final : public MenuItemHandler { public: CloseChildCommand() : MenuItemHandler(MI_CloseChild) {} void execute() override { closeSubXsheet(1); } @@ -2118,7 +2118,7 @@ public: // ToggleEditInPlaceCommand //----------------------------------------------------------------------------- -class ToggleEditInPlaceCommand : public MenuItemHandler { +class ToggleEditInPlaceCommand final : public MenuItemHandler { public: ToggleEditInPlaceCommand() : MenuItemHandler(MI_ToggleEditInPlace) {} void execute() override { toggleEditInPlace(); } diff --git a/toonz/sources/toonz/svncleanupdialog.h b/toonz/sources/toonz/svncleanupdialog.h index dceb81c..596f695 100644 --- a/toonz/sources/toonz/svncleanupdialog.h +++ b/toonz/sources/toonz/svncleanupdialog.h @@ -11,7 +11,7 @@ class QLabel; //----------------------------------------------------------------------------- -class SVNCleanupDialog : public DVGui::Dialog { +class SVNCleanupDialog final : public DVGui::Dialog { Q_OBJECT QPushButton *m_closeButton; diff --git a/toonz/sources/toonz/svncommitdialog.h b/toonz/sources/toonz/svncommitdialog.h index 7435f68..60df92d 100644 --- a/toonz/sources/toonz/svncommitdialog.h +++ b/toonz/sources/toonz/svncommitdialog.h @@ -22,7 +22,7 @@ class TXshLevel; //----------------------------------------------------------------------------- -class SVNCommitDialog : public DVGui::Dialog { +class SVNCommitDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; @@ -116,7 +116,7 @@ signals: //----------------------------------------------------------------------------- -class SVNCommitFrameRangeDialog : public DVGui::Dialog { +class SVNCommitFrameRangeDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; diff --git a/toonz/sources/toonz/svndeletedialog.h b/toonz/sources/toonz/svndeletedialog.h index ec19195..571dad7 100644 --- a/toonz/sources/toonz/svndeletedialog.h +++ b/toonz/sources/toonz/svndeletedialog.h @@ -15,7 +15,7 @@ class QFile; //----------------------------------------------------------------------------- -class SVNDeleteDialog : public DVGui::Dialog { +class SVNDeleteDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; diff --git a/toonz/sources/toonz/svnlockdialog.h b/toonz/sources/toonz/svnlockdialog.h index a241e6d..c0a44da 100644 --- a/toonz/sources/toonz/svnlockdialog.h +++ b/toonz/sources/toonz/svnlockdialog.h @@ -17,7 +17,7 @@ class QFile; //----------------------------------------------------------------------------- -class SVNLockDialog : public DVGui::Dialog { +class SVNLockDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; @@ -76,7 +76,7 @@ signals: //----------------------------------------------------------------------------- -class SVNLockInfoDialog : public DVGui::Dialog { +class SVNLockInfoDialog final : public DVGui::Dialog { Q_OBJECT SVNStatus m_status; diff --git a/toonz/sources/toonz/svnlockframerangedialog.h b/toonz/sources/toonz/svnlockframerangedialog.h index 5c28b1f..edae3fa 100644 --- a/toonz/sources/toonz/svnlockframerangedialog.h +++ b/toonz/sources/toonz/svnlockframerangedialog.h @@ -15,7 +15,7 @@ class QPlainTextEdit; //----------------------------------------------------------------------------- -class SVNLockFrameRangeDialog : public DVGui::Dialog { +class SVNLockFrameRangeDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; @@ -74,7 +74,7 @@ signals: //----------------------------------------------------------------------------- -class SVNLockMultiFrameRangeDialog : public DVGui::Dialog { +class SVNLockMultiFrameRangeDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; @@ -130,7 +130,7 @@ signals: //----------------------------------------------------------------------------- -class SVNUnlockFrameRangeDialog : public DVGui::Dialog { +class SVNUnlockFrameRangeDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; @@ -175,7 +175,7 @@ signals: //----------------------------------------------------------------------------- -class SVNUnlockMultiFrameRangeDialog : public DVGui::Dialog { +class SVNUnlockMultiFrameRangeDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; @@ -216,7 +216,7 @@ signals: //----------------------------------------------------------------------------- -class SVNFrameRangeLockInfoDialog : public DVGui::Dialog { +class SVNFrameRangeLockInfoDialog final : public DVGui::Dialog { Q_OBJECT QString m_workingDir; @@ -238,7 +238,7 @@ protected slots: //----------------------------------------------------------------------------- -class SVNMultiFrameRangeLockInfoDialog : public DVGui::Dialog { +class SVNMultiFrameRangeLockInfoDialog final : public DVGui::Dialog { Q_OBJECT QString m_workingDir; diff --git a/toonz/sources/toonz/svnpurgedialog.h b/toonz/sources/toonz/svnpurgedialog.h index ff42cc4..c97c26d 100644 --- a/toonz/sources/toonz/svnpurgedialog.h +++ b/toonz/sources/toonz/svnpurgedialog.h @@ -12,7 +12,7 @@ class QLabel; //----------------------------------------------------------------------------- -class SVNPurgeDialog : public DVGui::Dialog { +class SVNPurgeDialog final : public DVGui::Dialog { Q_OBJECT QString m_workingDir; diff --git a/toonz/sources/toonz/svnrevertdialog.h b/toonz/sources/toonz/svnrevertdialog.h index 3b782c5..777955f 100644 --- a/toonz/sources/toonz/svnrevertdialog.h +++ b/toonz/sources/toonz/svnrevertdialog.h @@ -14,7 +14,7 @@ class QCheckBox; //----------------------------------------------------------------------------- -class SVNRevertDialog : public DVGui::Dialog { +class SVNRevertDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; @@ -72,7 +72,7 @@ signals: //----------------------------------------------------------------------------- -class SVNRevertFrameRangeDialog : public DVGui::Dialog { +class SVNRevertFrameRangeDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; diff --git a/toonz/sources/toonz/svnupdateandlockdialog.h b/toonz/sources/toonz/svnupdateandlockdialog.h index c692cc7..1b8e2d8 100644 --- a/toonz/sources/toonz/svnupdateandlockdialog.h +++ b/toonz/sources/toonz/svnupdateandlockdialog.h @@ -15,7 +15,7 @@ class QCheckBox; //----------------------------------------------------------------------------- -class SVNUpdateAndLockDialog : public DVGui::Dialog { +class SVNUpdateAndLockDialog final : public DVGui::Dialog { Q_OBJECT QLabel *m_waitingLabel; diff --git a/toonz/sources/toonz/svnupdatedialog.h b/toonz/sources/toonz/svnupdatedialog.h index 1d475b8..b410a91 100644 --- a/toonz/sources/toonz/svnupdatedialog.h +++ b/toonz/sources/toonz/svnupdatedialog.h @@ -17,7 +17,7 @@ class QCheckBox; //----------------------------------------------------------------------------- -class SVNUpdateDialog : public DVGui::Dialog { +class SVNUpdateDialog final : public DVGui::Dialog { Q_OBJECT QPushButton *m_closeButton; diff --git a/toonz/sources/toonz/tapp.h b/toonz/sources/toonz/tapp.h index e742a1d..e057482 100644 --- a/toonz/sources/toonz/tapp.h +++ b/toonz/sources/toonz/tapp.h @@ -59,8 +59,8 @@ TApp::instance()->getCurrentObject()->getObjectId(); application and to notify through event handling to the rest of the code. */ -class TApp : public QObject, - public TTool::Application // Singleton +class TApp final : public QObject, + public TTool::Application // Singleton { Q_OBJECT diff --git a/toonz/sources/toonz/tasksviewer.cpp b/toonz/sources/toonz/tasksviewer.cpp index 72ab3aa..b9e99d8 100644 --- a/toonz/sources/toonz/tasksviewer.cpp +++ b/toonz/sources/toonz/tasksviewer.cpp @@ -230,7 +230,7 @@ bool containsTask(const TFarmTask::Dependencies &dependencies, //----------------------------------------------------------------------------- -class DependencyItem : public QListWidgetItem { +class DependencyItem final : public QListWidgetItem { public: TFarmTask *m_task; diff --git a/toonz/sources/toonz/tasksviewer.h b/toonz/sources/toonz/tasksviewer.h index ae83cfc..3013cdd 100644 --- a/toonz/sources/toonz/tasksviewer.h +++ b/toonz/sources/toonz/tasksviewer.h @@ -17,14 +17,14 @@ class TaskTreeView; class QListWidgetItem; class QComboBox; -class TaskTreeModel : public TreeModel { +class TaskTreeModel final : public TreeModel { Q_OBJECT // QModelIndex m_selectedIndex; TaskTreeView *m_view; public: - class Item : public TreeModel::Item { + class Item final : public TreeModel::Item { friend class TaskTreeModel; public: @@ -69,7 +69,7 @@ private: //------------------------------------------------------------------------------------------ class TasksViewer; -class TaskTreeView : public TreeView { +class TaskTreeView final : public TreeView { Q_OBJECT public: @@ -93,7 +93,7 @@ class TFarmTask; class QTextEdit; class QListWidget; -class TaskSheet : public QScrollArea { +class TaskSheet final : public QScrollArea { Q_OBJECT TasksViewer *m_viewer; @@ -161,7 +161,7 @@ public: //============================================================================= class QToolBar; -class TasksViewer : public QSplitter, public BatchesController::Observer { +class TasksViewer final : public QSplitter, public BatchesController::Observer { Q_OBJECT public: diff --git a/toonz/sources/toonz/testpanel.cpp b/toonz/sources/toonz/testpanel.cpp index 70f5845..e7d1989 100644 --- a/toonz/sources/toonz/testpanel.cpp +++ b/toonz/sources/toonz/testpanel.cpp @@ -113,7 +113,7 @@ void TestPanel::onColorValueChanged(const TPixel32 &, bool isDragging) { //============================================================================= // OpenFloatingTestPanel -class OpenFloatingTestPanel : public MenuItemHandler { +class OpenFloatingTestPanel final : public MenuItemHandler { public: OpenFloatingTestPanel() : MenuItemHandler(MI_OpenTest) {} void execute() override { diff --git a/toonz/sources/toonz/testpanel.h b/toonz/sources/toonz/testpanel.h index bab8615..0e300f3 100644 --- a/toonz/sources/toonz/testpanel.h +++ b/toonz/sources/toonz/testpanel.h @@ -9,7 +9,7 @@ //============================================================================= // TestPanel -class TestPanel : public TPanel { +class TestPanel final : public TPanel { Q_OBJECT public: diff --git a/toonz/sources/toonz/tfarmstuff.h b/toonz/sources/toonz/tfarmstuff.h index 3f75132..4f0c75e 100644 --- a/toonz/sources/toonz/tfarmstuff.h +++ b/toonz/sources/toonz/tfarmstuff.h @@ -33,7 +33,7 @@ public: //------------------------------------------------------------------------------ -class TaskInfoPage : public TFarmPage { +class TaskInfoPage final : public TFarmPage { public: TaskInfoPage(TWidget *parent); ~TaskInfoPage(); @@ -90,7 +90,7 @@ protected: //------------------------------------------------------------------------------ -class SubmitPage : public TFarmPage { +class SubmitPage final : public TFarmPage { public: SubmitPage(TWidget *parent); ~SubmitPage(); @@ -110,7 +110,7 @@ public: //------------------------------------------------------------------------------ -class TaskConfigPanel : public TWidget { +class TaskConfigPanel final : public TWidget { public: TaskConfigPanel(TWidget *parent) : TWidget(parent) {} @@ -120,7 +120,7 @@ public: //------------------------------------------------------------------------------ -class SubmitRenderPopup : public TModalPopup { +class SubmitRenderPopup final : public TModalPopup { public: SubmitRenderPopup(TWidget *parent, std::string name); ~SubmitRenderPopup(); @@ -144,7 +144,7 @@ private: //------------------------------------------------------------------------------ -class SubmitCleanupPopup : public TModalPopup { +class SubmitCleanupPopup final : public TModalPopup { public: SubmitCleanupPopup(TWidget *parent, std::string name); ~SubmitCleanupPopup(); @@ -168,7 +168,7 @@ private: //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -class GRootEnvVarPopup : public TModalPopup { +class GRootEnvVarPopup final : public TModalPopup { public: GRootEnvVarPopup(TWidget *parent, std::string name); ~GRootEnvVarPopup(); @@ -210,14 +210,14 @@ void getControllerData(QString &hostName, QString &ipAddr, int &port); //------------------------------------------------------------------------------ -class TMissingGRootFolder : public TException { +class TMissingGRootFolder final : public TException { public: TMissingGRootFolder() : TException() {} }; //------------------------------------------------------------------------------ -class TMissingGRootEnvironmentVariable : public TException { +class TMissingGRootEnvironmentVariable final : public TException { public: TMissingGRootEnvironmentVariable() : TException() {} }; diff --git a/toonz/sources/toonz/timestretchpopup.cpp b/toonz/sources/toonz/timestretchpopup.cpp index d6d57db..4dedeb3 100644 --- a/toonz/sources/toonz/timestretchpopup.cpp +++ b/toonz/sources/toonz/timestretchpopup.cpp @@ -37,7 +37,7 @@ namespace { //----------------------------------------------------------------------------- -class TimeStretchUndo : public TUndo { +class TimeStretchUndo final : public TUndo { int m_r0, m_r1; int m_c0, m_c1; int m_newRange; diff --git a/toonz/sources/toonz/timestretchpopup.h b/toonz/sources/toonz/timestretchpopup.h index 4ef3002..3ad57f2 100644 --- a/toonz/sources/toonz/timestretchpopup.h +++ b/toonz/sources/toonz/timestretchpopup.h @@ -18,7 +18,7 @@ class TSelection; // TimeStretchPopup //----------------------------------------------------------------------------- -class TimeStretchPopup : public DVGui::Dialog { +class TimeStretchPopup final : public DVGui::Dialog { Q_OBJECT QPushButton *m_okBtn; diff --git a/toonz/sources/toonz/toolbar.h b/toonz/sources/toonz/toolbar.h index 9f435c7..2ce8844 100755 --- a/toonz/sources/toonz/toolbar.h +++ b/toonz/sources/toonz/toolbar.h @@ -7,7 +7,7 @@ class QToolButton; -class Toolbar : public QToolBar { +class Toolbar final : public QToolBar { Q_OBJECT QToolButton *m_expandButton; diff --git a/toonz/sources/toonz/tpanels.cpp b/toonz/sources/toonz/tpanels.cpp index 0e05e3e..74fee6a 100644 --- a/toonz/sources/toonz/tpanels.cpp +++ b/toonz/sources/toonz/tpanels.cpp @@ -89,7 +89,7 @@ // XsheetViewer //----------------------------------------------------------------------------- -class XsheetViewerFactory : public TPanelFactory { +class XsheetViewerFactory final : public TPanelFactory { public: XsheetViewerFactory() : TPanelFactory("Xsheet") {} void initialize(TPanel *panel) override { @@ -106,7 +106,7 @@ public: // SchematicSceneViewerFactory //--------------------------------------------------------- -class SchematicSceneViewerFactory : public QObject, public TPanelFactory { +class SchematicSceneViewerFactory final : public QObject, public TPanelFactory { public: SchematicSceneViewerFactory() : TPanelFactory("Schematic") {} @@ -381,7 +381,7 @@ void FunctionViewerPanel::onIoCurve(int type, TDoubleParam *curve, // CurrentStyleChangeCommand //----------------------------------------------------------------------------- -class CurrentStyleChangeCommand : public ChangeStyleCommand { +class CurrentStyleChangeCommand final : public ChangeStyleCommand { public: CurrentStyleChangeCommand() {} ~CurrentStyleChangeCommand() {} @@ -549,7 +549,7 @@ void PaletteViewerPanel::onSceneSwitched() { //============================================================================= -class PaletteViewerFactory : public TPanelFactory { +class PaletteViewerFactory final : public TPanelFactory { public: PaletteViewerFactory() : TPanelFactory("LevelPalette") {} @@ -611,7 +611,7 @@ void StudioPaletteViewerPanel::onPaletteSwitched() { // StudioPaletteViewerFactory //----------------------------------------------------------------------------- -class StudioPaletteViewerFactory : public TPanelFactory { +class StudioPaletteViewerFactory final : public TPanelFactory { public: StudioPaletteViewerFactory() : TPanelFactory("StudioPalette") {} @@ -798,7 +798,7 @@ StyleEditorPanel::StyleEditorPanel(QWidget *parent) : TPanel(parent) { //----------------------------------------------------------------------------- -class StyleEditorFactory : public TPanelFactory { +class StyleEditorFactory final : public TPanelFactory { public: StyleEditorFactory() : TPanelFactory("StyleEditor") {} @@ -822,7 +822,7 @@ OpenFloatingPanel openStyleEditorCommand(MI_OpenStyleControl, "StyleEditor", // SceneViewer //----------------------------------------------------------------------------- -class SceneViewerFactory : public TPanelFactory { +class SceneViewerFactory final : public TPanelFactory { public: SceneViewerFactory() : TPanelFactory("SceneViewer") {} @@ -845,7 +845,7 @@ OpenFloatingPanel openSceneViewerCommand(MI_OpenLevelView, "SceneViewer", //----------------------------------------------------------------------------- -class ToolbarFactory : public TPanelFactory { +class ToolbarFactory final : public TPanelFactory { public: ToolbarFactory() : TPanelFactory("ToolBar") {} void initialize(TPanel *panel) override { @@ -877,7 +877,7 @@ ToolOptionPanel::ToolOptionPanel(QWidget *parent) // ToolOptionsFactory //----------------------------------------------------------------------------- -class ToolOptionsFactory : public TPanelFactory { +class ToolOptionsFactory final : public TPanelFactory { TPanel *m_panel; public: @@ -976,7 +976,7 @@ void FlipbookPanel::onDock(bool docked) { m_button->setVisible(!docked); } //----------------------------------------------------------------------------- -class FlipbookFactory : public TPanelFactory { +class FlipbookFactory final : public TPanelFactory { public: FlipbookFactory() : TPanelFactory("FlipBook") {} @@ -995,7 +995,7 @@ public: // TasksViewerFactory //----------------------------------------------------------------------------- -class TasksViewerFactory : public TPanelFactory { +class TasksViewerFactory final : public TPanelFactory { public: TasksViewerFactory() : TPanelFactory("Tasks") {} void initialize(TPanel *panel) override { @@ -1004,7 +1004,7 @@ public: } } tasksViewerFactory; -class BatchServersViewerFactory : public TPanelFactory { +class BatchServersViewerFactory final : public TPanelFactory { public: BatchServersViewerFactory() : TPanelFactory("BatchServers") {} void initialize(TPanel *panel) override { @@ -1014,7 +1014,7 @@ public: } batchServersViewerFactory; #endif -class BrowserFactory : public TPanelFactory { +class BrowserFactory final : public TPanelFactory { public: BrowserFactory() : TPanelFactory("Browser") {} void initialize(TPanel *panel) override { @@ -1031,7 +1031,7 @@ public: // CastViewerFactory //----------------------------------------------------------------------------- -class CastViewerFactory : public TPanelFactory { +class CastViewerFactory final : public TPanelFactory { public: CastViewerFactory() : TPanelFactory("SceneCast") {} void initialize(TPanel *panel) override { @@ -1044,7 +1044,7 @@ public: // FilmStripFactory //----------------------------------------------------------------------------- -class FilmStripFactory : public TPanelFactory { +class FilmStripFactory final : public TPanelFactory { public: FilmStripFactory() : TPanelFactory("FilmStrip") {} void initialize(TPanel *panel) override { @@ -1058,7 +1058,7 @@ public: //----------------------------------------------------------------------------- #ifdef LINETEST -class ExportFactory : public TPanelFactory { +class ExportFactory final : public TPanelFactory { public: ExportFactory() : TPanelFactory("Export") {} @@ -1082,7 +1082,7 @@ OpenFloatingPanel openExportPanelCommand(MI_OpenExport, "Export", #endif #ifndef LINETEST -class ColorModelViewerFactory : public TPanelFactory { +class ColorModelViewerFactory final : public TPanelFactory { public: ColorModelViewerFactory() : TPanelFactory("ColorModel") {} void initialize(TPanel *panel) override { @@ -1097,7 +1097,7 @@ public: // FunctionViewerFactory //----------------------------------------------------------------------------- -class FunctionViewerFactory : public TPanelFactory { +class FunctionViewerFactory final : public TPanelFactory { public: FunctionViewerFactory() : TPanelFactory("FunctionEditor") {} @@ -1120,7 +1120,7 @@ OpenFloatingPanel openFunctionViewerCommand(MI_OpenFunctionEditor, // TMessageViewerFactory //----------------------------------------------------------------------------- -class TMessageViewerFactory : public TPanelFactory { +class TMessageViewerFactory final : public TPanelFactory { public: TMessageViewerFactory() : TPanelFactory("TMessage") {} void initialize(TPanel *panel) override { @@ -1137,7 +1137,7 @@ OpenFloatingPanel openTMessageCommand(MI_OpenTMessage, "TMessage", // ScriptConsolePanelFactory //----------------------------------------------------------------------------- -class ScriptConsolePanelFactory : public TPanelFactory { +class ScriptConsolePanelFactory final : public TPanelFactory { public: ScriptConsolePanelFactory() : TPanelFactory("ScriptConsole") {} @@ -1164,7 +1164,7 @@ OpenFloatingPanel openTScriptConsoleCommand("MI_OpenScriptConsole", // LineTestViewer //----------------------------------------------------------------------------- -class LineTestFactory : public TPanelFactory { +class LineTestFactory final : public TPanelFactory { public: LineTestFactory() : TPanelFactory("LineTestViewer") {} @@ -1189,7 +1189,7 @@ OpenFloatingPanel openLineTestViewerCommand(MI_OpenLineTestView, // LineTestCapturePane //----------------------------------------------------------------------------- -class LineTestCaptureFactory : public TPanelFactory { +class LineTestCaptureFactory final : public TPanelFactory { public: LineTestCaptureFactory() : TPanelFactory("LineTestCapture") {} @@ -1216,7 +1216,7 @@ OpenFloatingPanel openLineTestCaptureCommand(MI_OpenLineTestCapture, // ComboViewer : Viewer + Toolbar + Tool Options //----------------------------------------------------------------------------- -class ComboViewerFactory : public TPanelFactory { +class ComboViewerFactory final : public TPanelFactory { public: ComboViewerFactory() : TPanelFactory("ComboViewer") {} TPanel *createPanel(QWidget *parent) override { @@ -1241,7 +1241,7 @@ OpenFloatingPanel openComboViewerCommand(MI_OpenComboViewer, "ComboViewer", // CleanupSettings DockWindow //----------------------------------------------------------------------------- -class CleanupSettingsFactory : public TPanelFactory { +class CleanupSettingsFactory final : public TPanelFactory { public: CleanupSettingsFactory() : TPanelFactory("CleanupSettings") {} @@ -1263,7 +1263,7 @@ OpenFloatingPanel openCleanupSettingsDockCommand( //----------------------------------------------------------------------------- -class HistoryPanelFactory : public TPanelFactory { +class HistoryPanelFactory final : public TPanelFactory { public: HistoryPanelFactory() : TPanelFactory("HistoryPanel") {} void initialize(TPanel *panel) override { diff --git a/toonz/sources/toonz/tpanels.h b/toonz/sources/toonz/tpanels.h index 1f36945..ed6cbf8 100644 --- a/toonz/sources/toonz/tpanels.h +++ b/toonz/sources/toonz/tpanels.h @@ -27,7 +27,7 @@ class ToolOptions; // PaletteViewerPanel //--------------------------------------------------------- -class PaletteViewerPanel : public TPanel { +class PaletteViewerPanel final : public TPanel { Q_OBJECT TPaletteHandle *m_paletteHandle; @@ -59,7 +59,7 @@ protected slots: // StudioPaletteViewerPanel //--------------------------------------------------------- -class StudioPaletteViewerPanel : public TPanel { +class StudioPaletteViewerPanel final : public TPanel { Q_OBJECT TPaletteHandle *m_studioPaletteHandle; @@ -79,7 +79,7 @@ protected slots: // StyleEditorPanel //--------------------------------------------------------- -class StyleEditorPanel : public TPanel { +class StyleEditorPanel final : public TPanel { Q_OBJECT StyleEditor *m_styleEditor; @@ -91,7 +91,7 @@ public: // ColorFieldEditorController //--------------------------------------------------------- -class ColorFieldEditorController +class ColorFieldEditorController final : public QObject, public DVGui::ColorField::ColorFieldEditorController { Q_OBJECT @@ -117,7 +117,7 @@ protected slots: // CleanupColorFieldEditorController //--------------------------------------------------------- -class CleanupColorFieldEditorController +class CleanupColorFieldEditorController final : public QObject, public DVGui::CleanupColorField::CleanupColorFieldEditorController { Q_OBJECT @@ -143,7 +143,7 @@ protected slots: // SchematicScenePanel //--------------------------------------------------------- -class SchematicScenePanel : public TPanel { +class SchematicScenePanel final : public TPanel { Q_OBJECT SchematicViewer *m_schematicViewer; @@ -171,7 +171,7 @@ protected slots: // FunctionViewerPanel //--------------------------------------------------------- -class FunctionViewerPanel : public TPanel { +class FunctionViewerPanel final : public TPanel { Q_OBJECT FunctionViewer *m_functionViewer; @@ -200,7 +200,7 @@ public slots: // ToolOptionPanel //--------------------------------------------------------- -class ToolOptionPanel : public TPanel { +class ToolOptionPanel final : public TPanel { Q_OBJECT ToolOptions *m_toolOption; @@ -213,7 +213,7 @@ public: // FlipbookPanel //--------------------------------------------------------- -class FlipbookPanel : public TPanel { +class FlipbookPanel final : public TPanel { Q_OBJECT FlipBook *m_flipbook; diff --git a/toonz/sources/toonz/trackerpopup.h b/toonz/sources/toonz/trackerpopup.h index 04cc1df..900b88d 100644 --- a/toonz/sources/toonz/trackerpopup.h +++ b/toonz/sources/toonz/trackerpopup.h @@ -42,7 +42,7 @@ class CheckBox; /*!Consente di cambiare modalita' di vettorizzazione e quindi in funzione di questa di cambiare i parametri da settare.*/ -class TrackerPopup : public DVGui::Dialog { +class TrackerPopup final : public DVGui::Dialog { Q_OBJECT DVGui::DoubleField *m_threshold; @@ -134,7 +134,7 @@ private: QString getErrorMessage(int errorCode); }; -class MyThread : public QThread { +class MyThread final : public QThread { Tracker *m_tracker; public: diff --git a/toonz/sources/toonz/vcrcommand.cpp b/toonz/sources/toonz/vcrcommand.cpp index c716b59..5b848b3 100644 --- a/toonz/sources/toonz/vcrcommand.cpp +++ b/toonz/sources/toonz/vcrcommand.cpp @@ -20,7 +20,7 @@ // Commands definition //********************************************************************************** -class LinkToggleCommand : public MenuItemHandler { +class LinkToggleCommand final : public MenuItemHandler { public: LinkToggleCommand() : MenuItemHandler("MI_Link") {} void execute() override { FlipConsole::toggleLinked(); } @@ -28,7 +28,7 @@ public: //----------------------------------------------------------------------------- -class VcrCommand : public MenuItemHandler { +class VcrCommand final : public MenuItemHandler { FlipConsole::EGadget m_buttonId; public: @@ -42,7 +42,7 @@ public: //----------------------------------------------------------------------------- -class NextDrawingCommand : public MenuItemHandler { +class NextDrawingCommand final : public MenuItemHandler { public: NextDrawingCommand() : MenuItemHandler(MI_NextDrawing) {} @@ -65,7 +65,7 @@ public: //----------------------------------------------------------------------------- -class PrevDrawingCommand : public MenuItemHandler { +class PrevDrawingCommand final : public MenuItemHandler { public: PrevDrawingCommand() : MenuItemHandler(MI_PrevDrawing) {} @@ -96,7 +96,7 @@ public: //----------------------------------------------------------------------------- -class NextStepCommand : public MenuItemHandler { +class NextStepCommand final : public MenuItemHandler { public: NextStepCommand() : MenuItemHandler(MI_NextStep) {} @@ -110,7 +110,7 @@ public: //----------------------------------------------------------------------------- -class PrevStepCommand : public MenuItemHandler { +class PrevStepCommand final : public MenuItemHandler { public: PrevStepCommand() : MenuItemHandler(MI_PrevStep) {} diff --git a/toonz/sources/toonz/vectorizerpopup.h b/toonz/sources/toonz/vectorizerpopup.h index 5140a7b..a0fb062 100644 --- a/toonz/sources/toonz/vectorizerpopup.h +++ b/toonz/sources/toonz/vectorizerpopup.h @@ -84,7 +84,7 @@ class CheckBox; classes. */ -class VectorizerPopup : public DVGui::Dialog { +class VectorizerPopup final : public DVGui::Dialog { Q_OBJECT public: @@ -262,7 +262,7 @@ private slots: classes. */ -class Vectorizer : public QThread { +class Vectorizer final : public QThread { Q_OBJECT public: @@ -314,7 +314,7 @@ protected: be called before invoking run(). */ void run() override; //!< Starts the vectorization thread (see QThread - //!documentation). + //! documentation). private: TXshSimpleLevelP m_level; //!< Input level to vectorize (only one level at a diff --git a/toonz/sources/toonz/vectorizerswatch.cpp b/toonz/sources/toonz/vectorizerswatch.cpp index 49e02cb..bf65f8a 100644 --- a/toonz/sources/toonz/vectorizerswatch.cpp +++ b/toonz/sources/toonz/vectorizerswatch.cpp @@ -100,7 +100,7 @@ namespace { VectorizationSwatchData is the 'server' singleton data class used to vectorize within swatch areas. */ -struct VectorizationBuilder : public TThread::Executor { +struct VectorizationBuilder final : public TThread::Executor { int m_row, m_col; bool m_done, m_submitted; diff --git a/toonz/sources/toonz/vectorizerswatch.h b/toonz/sources/toonz/vectorizerswatch.h index 6a49b9f..576c8d5 100644 --- a/toonz/sources/toonz/vectorizerswatch.h +++ b/toonz/sources/toonz/vectorizerswatch.h @@ -19,7 +19,7 @@ // VectorizerSwatchArea declaration //***************************************************************************** -class VectorizerSwatchArea : public QFrame { +class VectorizerSwatchArea final : public QFrame { Q_OBJECT public: @@ -60,7 +60,7 @@ public slots: // VectorizerSwatchArea::Swatch declaration //***************************************************************************** -class VectorizerSwatchArea::Swatch : public PlaneViewer { +class VectorizerSwatchArea::Swatch final : public PlaneViewer { TImageP m_img; VectorizerSwatchArea *m_area; @@ -87,7 +87,7 @@ protected: // VectorizationSwatchTask declaration - Private class //***************************************************************************** -class VectorizationSwatchTask : public TThread::Runnable { +class VectorizationSwatchTask final : public TThread::Runnable { Q_OBJECT int m_row, m_col; diff --git a/toonz/sources/toonz/versioncontrol.h b/toonz/sources/toonz/versioncontrol.h index 46ac697..35607f8 100644 --- a/toonz/sources/toonz/versioncontrol.h +++ b/toonz/sources/toonz/versioncontrol.h @@ -19,7 +19,7 @@ class TLevelSet; //----------------------------------------------------------------------------- -class VersionControlThread : public QThread { +class VersionControlThread final : public QThread { Q_OBJECT bool m_abort; @@ -66,7 +66,7 @@ signals: //----------------------------------------------------------------------------- -class VersionControlManager : public QObject { +class VersionControlManager final : public QObject { Q_OBJECT VersionControlThread m_thread; @@ -91,7 +91,7 @@ protected slots: //----------------------------------------------------------------------------- -class VersionControl : public QObject { +class VersionControl final : public QObject { Q_OBJECT QString m_userName; diff --git a/toonz/sources/toonz/versioncontroltimeline.h b/toonz/sources/toonz/versioncontroltimeline.h index 1413a14..9f5dffc 100644 --- a/toonz/sources/toonz/versioncontroltimeline.h +++ b/toonz/sources/toonz/versioncontroltimeline.h @@ -17,7 +17,7 @@ class QTimer; //----------------------------------------------------------------------------- -class TimelineWidget : public QWidget { +class TimelineWidget final : public QWidget { Q_OBJECT QListWidget *m_listWidget; @@ -31,7 +31,7 @@ public: //----------------------------------------------------------------------------- -class SVNTimeline : public DVGui::Dialog { +class SVNTimeline final : public DVGui::Dialog { Q_OBJECT TimelineWidget *m_timelineWidget; diff --git a/toonz/sources/toonz/versioncontrolwidget.h b/toonz/sources/toonz/versioncontrolwidget.h index 921fc09..bb7d2dd 100644 --- a/toonz/sources/toonz/versioncontrolwidget.h +++ b/toonz/sources/toonz/versioncontrolwidget.h @@ -18,7 +18,7 @@ class DoubleRadioWidget; //----------------------------------------------------------------------------- -class DateChooserWidget : public QWidget { +class DateChooserWidget final : public QWidget { Q_OBJECT int m_selectedRadioIndex; @@ -45,7 +45,7 @@ protected slots: //----------------------------------------------------------------------------- -class ConflictWidget : public QWidget { +class ConflictWidget final : public QWidget { Q_OBJECT QVBoxLayout *m_mainLayout; @@ -72,7 +72,7 @@ signals: //----------------------------------------------------------------------------- -class DoubleRadioWidget : public QWidget { +class DoubleRadioWidget final : public QWidget { Q_OBJECT QLabel *m_label; diff --git a/toonz/sources/toonz/versioncontrolxmlreader.h b/toonz/sources/toonz/versioncontrolxmlreader.h index 5e18bff..7c2901c 100644 --- a/toonz/sources/toonz/versioncontrolxmlreader.h +++ b/toonz/sources/toonz/versioncontrolxmlreader.h @@ -25,7 +25,7 @@ struct SVNPartialLock { //----------------------------------------------------------------------------- -class SVNPartialLockReader : public QXmlStreamReader { +class SVNPartialLockReader final : public QXmlStreamReader { QList m_partialLock; QString m_data; @@ -56,7 +56,7 @@ struct SVNRepository { //----------------------------------------------------------------------------- -class SVNConfigReader : public QXmlStreamReader { +class SVNConfigReader final : public QXmlStreamReader { QList m_repositories; QString m_data; @@ -98,7 +98,7 @@ struct SVNStatus { //----------------------------------------------------------------------------- -class SVNStatusReader : public QXmlStreamReader { +class SVNStatusReader final : public QXmlStreamReader { QList m_status; QString m_data; @@ -141,7 +141,7 @@ struct SVNLog { //----------------------------------------------------------------------------- -class SVNLogReader : public QXmlStreamReader { +class SVNLogReader final : public QXmlStreamReader { QList m_log; QString m_data; @@ -163,7 +163,7 @@ protected: //----------------------------------------------------------------------------- -class SVNInfoReader : public QXmlStreamReader { +class SVNInfoReader final : public QXmlStreamReader { QString m_data; QString m_revision; @@ -189,7 +189,7 @@ struct SVNListInfo { //----------------------------------------------------------------------------- -class SVNListReader : public QXmlStreamReader { +class SVNListReader final : public QXmlStreamReader { QString m_data; QList m_listInfo; diff --git a/toonz/sources/toonz/viewerpane.h b/toonz/sources/toonz/viewerpane.h index 4604436..5ed1a30 100644 --- a/toonz/sources/toonz/viewerpane.h +++ b/toonz/sources/toonz/viewerpane.h @@ -25,7 +25,7 @@ class Ruler; class FlipConsole; class TXshLevel; -class SceneViewerPanel : public TPanel, public FlipConsoleOwner { +class SceneViewerPanel final : public TPanel, public FlipConsoleOwner { Q_OBJECT friend class SceneViewer; diff --git a/toonz/sources/toonz/viewerpopup.h b/toonz/sources/toonz/viewerpopup.h index 3ab88f6..2d714bb 100644 --- a/toonz/sources/toonz/viewerpopup.h +++ b/toonz/sources/toonz/viewerpopup.h @@ -15,7 +15,7 @@ // \/ //----------------------------------------------------------------------------- /* -class ViewerPopup : public FlipBook +class ViewerPopup final : public FlipBook { Q_OBJECT public: diff --git a/toonz/sources/toonz/xshcellmover.cpp b/toonz/sources/toonz/xshcellmover.cpp index 29c0664..89052c6 100644 --- a/toonz/sources/toonz/xshcellmover.cpp +++ b/toonz/sources/toonz/xshcellmover.cpp @@ -242,7 +242,7 @@ TXshColumn::ColumnType CellsMover::getColumnTypeFromCell(int index) const { //============================================================================= -class LevelMoverUndo : public TUndo { +class LevelMoverUndo final : public TUndo { CellsMover m_cellsMover; public: diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp index 22599e2..a02b533 100644 --- a/toonz/sources/toonz/xshcellviewer.cpp +++ b/toonz/sources/toonz/xshcellviewer.cpp @@ -444,7 +444,7 @@ void setParamStep(int indexKeyframe, int step, TDoubleParam *param) { // RenameCellUndo //----------------------------------------------------------------------------- -class RenameCellUndo : public TUndo { +class RenameCellUndo final : public TUndo { int m_row; int m_col; const TXshCell m_oldCell; @@ -1572,7 +1572,7 @@ void CellArea::paintEvent(QPaintEvent *event) { //----------------------------------------------------------------------------- -class CycleUndo : public TUndo { +class CycleUndo final : public TUndo { TStageObject *m_pegbar; CellArea *m_area; diff --git a/toonz/sources/toonz/xshcellviewer.h b/toonz/sources/toonz/xshcellviewer.h index e88f8da..31d24b4 100644 --- a/toonz/sources/toonz/xshcellviewer.h +++ b/toonz/sources/toonz/xshcellviewer.h @@ -16,7 +16,7 @@ namespace XsheetGUI { class NoteWidget; class DragTool; -class RenameCellField : public QLineEdit { +class RenameCellField final : public QLineEdit { Q_OBJECT int m_row; @@ -44,7 +44,7 @@ protected slots: //----------------------------------------------------------------------------- //! La classe si occupa della visualizzazione delle celle nel viewer. -class CellArea : public QWidget { +class CellArea final : public QWidget { Q_OBJECT XsheetViewer *m_viewer; diff --git a/toonz/sources/toonz/xshcolumnviewer.h b/toonz/sources/toonz/xshcolumnviewer.h index 5b1303c..282ef9b 100644 --- a/toonz/sources/toonz/xshcolumnviewer.h +++ b/toonz/sources/toonz/xshcolumnviewer.h @@ -23,7 +23,7 @@ class DragTool; // MotionPathMenu //----------------------------------------------------------------------------- -class MotionPathMenu : public QWidget { +class MotionPathMenu final : public QWidget { Q_OBJECT QRect m_mDeleteRect; @@ -84,7 +84,7 @@ protected slots: // ChangeObjectParent //----------------------------------------------------------------------------- -class ChangeObjectParent : public ChangeObjectWidget { +class ChangeObjectParent final : public ChangeObjectWidget { Q_OBJECT public: @@ -101,7 +101,7 @@ protected slots: // ChangeObjectHandle //----------------------------------------------------------------------------- -class ChangeObjectHandle : public ChangeObjectWidget { +class ChangeObjectHandle final : public ChangeObjectWidget { Q_OBJECT public: @@ -118,7 +118,7 @@ protected slots: // RenameColumnField //----------------------------------------------------------------------------- -class RenameColumnField : public QLineEdit { +class RenameColumnField final : public QLineEdit { Q_OBJECT int m_col; @@ -146,7 +146,7 @@ protected slots: // ColumnArea //----------------------------------------------------------------------------- -class ColumnTransparencyPopup : public QWidget { +class ColumnTransparencyPopup final : public QWidget { Q_OBJECT QSlider *m_slider; @@ -169,7 +169,7 @@ protected slots: }; //! La classe si occupa della visualizzazione dell'area che gestisce le colonne. -class ColumnArea : public QWidget { +class ColumnArea final : public QWidget { Q_OBJECT enum { ToggleTransparency = 1, TogglePreviewVisible, ToggleLock }; diff --git a/toonz/sources/toonz/xsheetcmd.cpp b/toonz/sources/toonz/xsheetcmd.cpp index a73895f..00493be 100644 --- a/toonz/sources/toonz/xsheetcmd.cpp +++ b/toonz/sources/toonz/xsheetcmd.cpp @@ -212,7 +212,7 @@ void insertSceneFrame(int frame) { //============================================================================= -class InsertSceneFrameCommand : public MenuItemHandler { +class InsertSceneFrameCommand final : public MenuItemHandler { public: InsertSceneFrameCommand() : MenuItemHandler(MI_InsertSceneFrame) {} void execute() override { @@ -225,7 +225,7 @@ public: // RemoveSceneFrame command //***************************************************************************** -class RemoveSceneFrameUndo : public InsertSceneFrameUndo { +class RemoveSceneFrameUndo final : public InsertSceneFrameUndo { std::vector m_cells; std::vector m_keyframes; @@ -307,7 +307,7 @@ void removeSceneFrame(int frame) { //============================================================================= -class RemoveSceneFrameCommand : public MenuItemHandler { +class RemoveSceneFrameCommand final : public MenuItemHandler { public: RemoveSceneFrameCommand() : MenuItemHandler(MI_RemoveSceneFrame) {} void execute() override { @@ -411,7 +411,7 @@ void GlobalKeyframeUndo::doRemoveGlobalKeyframes( // InsertGlobalKeyframe command //***************************************************************************** -class InsertGlobalKeyframeUndo : public GlobalKeyframeUndo { +class InsertGlobalKeyframeUndo final : public GlobalKeyframeUndo { public: InsertGlobalKeyframeUndo(int frame, const std::vector &columns) : GlobalKeyframeUndo(frame) { @@ -457,7 +457,7 @@ void insertGlobalKeyframe(int frame) { //============================================================================= -class InsertGlobalKeyframeCommand : public MenuItemHandler { +class InsertGlobalKeyframeCommand final : public MenuItemHandler { public: InsertGlobalKeyframeCommand() : MenuItemHandler(MI_InsertGlobalKeyframe) {} void execute() override { @@ -470,7 +470,7 @@ public: // RemoveGlobalKeyframe command //***************************************************************************** -class RemoveGlobalKeyframeUndo : public GlobalKeyframeUndo { +class RemoveGlobalKeyframeUndo final : public GlobalKeyframeUndo { std::vector m_keyframes; public: @@ -550,7 +550,7 @@ void removeGlobalKeyframe(int frame) { //============================================================================= -class RemoveGlobalKeyframeCommand : public MenuItemHandler { +class RemoveGlobalKeyframeCommand final : public MenuItemHandler { public: RemoveGlobalKeyframeCommand() : MenuItemHandler(MI_RemoveGlobalKeyframe) {} void execute() override { @@ -562,7 +562,7 @@ public: //============================================================ // Drawing Substitution //============================================================ -class DrawingSubtitutionUndo : public TUndo { +class DrawingSubtitutionUndo final : public TUndo { private: int m_direction, m_row, m_col; TCellSelection::Range m_range; @@ -635,7 +635,7 @@ protected: //============================================================ -class DrawingSubtitutionGroupUndo : public TUndo { +class DrawingSubtitutionGroupUndo final : public TUndo { private: int m_direction; int m_row; @@ -728,6 +728,8 @@ bool DrawingSubtitutionUndo::changeDrawing(int delta, int row, int col) { index = (index + delta) % n; setDrawing(fids[index], row, col, cell); + + return true; } void DrawingSubtitutionUndo::setDrawing(const TFrameId &fid, int row, int col, @@ -778,7 +780,7 @@ void drawingSubstituionGroup(int dir) { //============================================================================= -class DrawingSubstitutionForwardCommand : public MenuItemHandler { +class DrawingSubstitutionForwardCommand final : public MenuItemHandler { public: DrawingSubstitutionForwardCommand() : MenuItemHandler(MI_DrawingSubForward) {} void execute() override { XshCmd::drawingSubstituion(1); } @@ -786,7 +788,7 @@ public: //============================================================ -class DrawingSubstitutionBackwardCommand : public MenuItemHandler { +class DrawingSubstitutionBackwardCommand final : public MenuItemHandler { public: DrawingSubstitutionBackwardCommand() : MenuItemHandler(MI_DrawingSubBackward) {} @@ -795,7 +797,7 @@ public: //============================================================================= -class DrawingSubstitutionGroupForwardCommand : public MenuItemHandler { +class DrawingSubstitutionGroupForwardCommand final : public MenuItemHandler { public: DrawingSubstitutionGroupForwardCommand() : MenuItemHandler(MI_DrawingSubGroupForward) {} @@ -804,7 +806,7 @@ public: //============================================================ -class DrawingSubstitutionGroupBackwardCommand : public MenuItemHandler { +class DrawingSubstitutionGroupBackwardCommand final : public MenuItemHandler { public: DrawingSubstitutionGroupBackwardCommand() : MenuItemHandler(MI_DrawingSubGroupBackward) {} @@ -819,7 +821,7 @@ public: // Selection commands //***************************************************************************** -class SelectRowKeyframesCommand : public MenuItemHandler { +class SelectRowKeyframesCommand final : public MenuItemHandler { public: SelectRowKeyframesCommand() : MenuItemHandler(MI_SelectRowKeyframes) {} @@ -852,7 +854,7 @@ public: //----------------------------------------------------------------------------- -class SelectColumnKeyframesCommand : public MenuItemHandler { +class SelectColumnKeyframesCommand final : public MenuItemHandler { public: SelectColumnKeyframesCommand() : MenuItemHandler(MI_SelectColumnKeyframes) {} @@ -883,7 +885,7 @@ public: //----------------------------------------------------------------------------- -class SelectAllKeyframesCommand : public MenuItemHandler { +class SelectAllKeyframesCommand final : public MenuItemHandler { public: SelectAllKeyframesCommand() : MenuItemHandler(MI_SelectAllKeyframes) {} @@ -922,7 +924,7 @@ public: //----------------------------------------------------------------------------- -class SelectAllKeyframesBeforeCommand : public MenuItemHandler { +class SelectAllKeyframesBeforeCommand final : public MenuItemHandler { public: SelectAllKeyframesBeforeCommand() : MenuItemHandler(MI_SelectAllKeyframesNotBefore) {} @@ -963,7 +965,7 @@ public: //----------------------------------------------------------------------------- -class SelectAllKeyframesAfterCommand : public MenuItemHandler { +class SelectAllKeyframesAfterCommand final : public MenuItemHandler { public: SelectAllKeyframesAfterCommand() : MenuItemHandler(MI_SelectAllKeyframesNotAfter) {} @@ -1005,7 +1007,7 @@ public: //----------------------------------------------------------------------------- -class SelectPreviousKeysInColumnCommand : public MenuItemHandler { +class SelectPreviousKeysInColumnCommand final : public MenuItemHandler { public: SelectPreviousKeysInColumnCommand() : MenuItemHandler(MI_SelectPreviousKeysInColumn) {} @@ -1043,7 +1045,7 @@ public: //----------------------------------------------------------------------------- -class SelectFollowingKeysInColumnCommand : public MenuItemHandler { +class SelectFollowingKeysInColumnCommand final : public MenuItemHandler { public: SelectFollowingKeysInColumnCommand() : MenuItemHandler(MI_SelectFollowingKeysInColumn) {} @@ -1080,7 +1082,7 @@ public: //----------------------------------------------------------------------------- -class SelectPreviousKeysInRowCommand : public MenuItemHandler { +class SelectPreviousKeysInRowCommand final : public MenuItemHandler { public: SelectPreviousKeysInRowCommand() : MenuItemHandler(MI_SelectPreviousKeysInRow) {} @@ -1124,7 +1126,7 @@ public: //----------------------------------------------------------------------------- -class SelectFollowingKeysInRowCommand : public MenuItemHandler { +class SelectFollowingKeysInRowCommand final : public MenuItemHandler { public: SelectFollowingKeysInRowCommand() : MenuItemHandler(MI_SelectFollowingKeysInRow) {} @@ -1170,7 +1172,7 @@ public: //----------------------------------------------------------------------------- -class InvertKeyframeSelectionCommand : public MenuItemHandler { +class InvertKeyframeSelectionCommand final : public MenuItemHandler { public: InvertKeyframeSelectionCommand() : MenuItemHandler(MI_InvertKeyframeSelection) {} @@ -1215,7 +1217,7 @@ public: namespace { -class KeyFrameHandleCommandUndo : public TUndo { +class KeyFrameHandleCommandUndo final : public TUndo { TStageObjectId m_objId; int m_rowFirst, m_rowSecond; @@ -1278,7 +1280,7 @@ public: //----------------------------------------------------------------------------- -class SetAccelerationCommand : public MenuItemHandler { +class SetAccelerationCommand final : public MenuItemHandler { public: SetAccelerationCommand() : MenuItemHandler(MI_SetAcceleration) {} @@ -1325,7 +1327,7 @@ public: //----------------------------------------------------------------------------- -class SetDecelerationCommand : public MenuItemHandler { +class SetDecelerationCommand final : public MenuItemHandler { public: SetDecelerationCommand() : MenuItemHandler(MI_SetDeceleration) {} @@ -1368,7 +1370,7 @@ public: //----------------------------------------------------------------------------- -class SetConstantSpeedCommand : public MenuItemHandler { +class SetConstantSpeedCommand final : public MenuItemHandler { public: SetConstantSpeedCommand() : MenuItemHandler(MI_SetConstantSpeed) {} @@ -1409,7 +1411,7 @@ public: //----------------------------------------------------------------------------- -class ResetArrowCommand : public MenuItemHandler { +class ResetArrowCommand final : public MenuItemHandler { public: ResetArrowCommand() : MenuItemHandler(MI_ResetInterpolation) {} @@ -1453,7 +1455,7 @@ public: // To Be Reworked //=========================================================== -class NewOutputFx : public MenuItemHandler { +class NewOutputFx final : public MenuItemHandler { public: NewOutputFx() : MenuItemHandler(MI_NewOutputFx) {} @@ -1806,7 +1808,7 @@ void makeHtml(TFilePath fp) { os << "" << endl; } -class PrintXsheetCommand : public MenuItemHandler { +class PrintXsheetCommand final : public MenuItemHandler { public: PrintXsheetCommand() : MenuItemHandler(MI_PrintXsheet) {} void execute() override; diff --git a/toonz/sources/toonz/xsheetdragtool.cpp b/toonz/sources/toonz/xsheetdragtool.cpp index ef2c462..582477e 100644 --- a/toonz/sources/toonz/xsheetdragtool.cpp +++ b/toonz/sources/toonz/xsheetdragtool.cpp @@ -108,7 +108,7 @@ void XsheetGUI::DragTool::onRelease(const QMouseEvent *event) { // XsheetSelection DragTool //----------------------------------------------------------------------------- -class XsheetSelectionDragTool : public XsheetGUI::DragTool { +class XsheetSelectionDragTool final : public XsheetGUI::DragTool { int m_firstRow, m_firstCol; Qt::KeyboardModifiers m_modifier; @@ -199,7 +199,7 @@ XsheetGUI::DragTool *XsheetGUI::DragTool::makeSelectionTool( //----------------------------------------------------------------------------- namespace { -class UndoPlayRangeModifier : public TUndo { +class UndoPlayRangeModifier final : public TUndo { int m_oldR0, m_oldR1, m_newR0, m_newR1, m_newStep, m_oldStep; public: @@ -310,7 +310,7 @@ namespace { // LevelExtenderUndo //----------------------------------------------------------------------------- -class LevelExtenderUndo : public TUndo { +class LevelExtenderUndo final : public TUndo { int m_colCount; int m_rowCount; int m_col, m_row, m_deltaRow; @@ -609,7 +609,7 @@ public: // LevelExtenderTool //----------------------------------------------------------------------------- -class LevelExtenderTool : public XsheetGUI::DragTool { +class LevelExtenderTool final : public XsheetGUI::DragTool { int m_colCount; int m_rowCount; int m_c0, m_r0, m_r1; @@ -779,7 +779,7 @@ namespace { // SoundLevelModifierUndo //----------------------------------------------------------------------------- -class SoundLevelModifierUndo : public TUndo { +class SoundLevelModifierUndo final : public TUndo { int m_col; TXshSoundColumnP m_newSoundColumn; TXshSoundColumnP m_oldSoundColumn; @@ -835,7 +835,7 @@ public: // SoundLevelModifierTool //----------------------------------------------------------------------------- -class SoundLevelModifierTool : public XsheetGUI::DragTool { +class SoundLevelModifierTool final : public XsheetGUI::DragTool { int m_col; int m_firstRow; TXshSoundColumnP m_oldColumn; @@ -962,7 +962,7 @@ XsheetGUI::DragTool *XsheetGUI::DragTool::makeKeyframeMoverTool( // Cell KeyFrame Mover DragTool //----------------------------------------------------------------------------- -class CellKeyframeMoverTool : public LevelMoverTool { +class CellKeyframeMoverTool final : public LevelMoverTool { KeyframeMoverTool *m_keyframeMoverTool; protected: @@ -1016,7 +1016,7 @@ namespace { // KeyFrameHandleUndo //----------------------------------------------------------------------------- -class KeyFrameHandleUndo : public TUndo { +class KeyFrameHandleUndo final : public TUndo { TStageObjectId m_objId; int m_row; TStageObject::Keyframe m_oldKeyframe, m_newKeyframe; @@ -1064,7 +1064,7 @@ public: // KeyFrameHandleMoverTool //----------------------------------------------------------------------------- -class KeyFrameHandleMoverTool : public XsheetGUI::DragTool { +class KeyFrameHandleMoverTool final : public XsheetGUI::DragTool { public: enum HandleType { EaseOut = 0, EaseIn = 1 }; @@ -1160,7 +1160,7 @@ namespace { // OnionSkinMaskModifierTool //----------------------------------------------------------------------------- -class NoteMoveTool : public XsheetGUI::DragTool { +class NoteMoveTool final : public XsheetGUI::DragTool { TPointD m_startPos, m_delta; int m_startRow, m_startCol; @@ -1241,7 +1241,7 @@ namespace { // OnionSkinMaskModifierTool //----------------------------------------------------------------------------- -class OnionSkinMaskModifierTool : public XsheetGUI::DragTool { +class OnionSkinMaskModifierTool final : public XsheetGUI::DragTool { OnionSkinMaskModifier m_modifier; bool m_isFos; @@ -1298,7 +1298,7 @@ namespace { // CurrentFrameModifier //----------------------------------------------------------------------------- -class CurrentFrameModifier : public XsheetGUI::DragTool { +class CurrentFrameModifier final : public XsheetGUI::DragTool { public: CurrentFrameModifier(XsheetViewer *viewer) : DragTool(viewer) {} @@ -1346,7 +1346,7 @@ namespace { // PlayRangeModifier //----------------------------------------------------------------------------- -class PlayRangeModifier : public XsheetGUI::DragTool { +class PlayRangeModifier final : public XsheetGUI::DragTool { bool m_movingFirst; int m_oldR0, m_oldR1, m_oldStep; @@ -1418,7 +1418,7 @@ XsheetGUI::DragTool *XsheetGUI::DragTool::makePlayRangeModifierTool( namespace { -class ColumnSelectionTool : public XsheetGUI::DragTool { +class ColumnSelectionTool final : public XsheetGUI::DragTool { int m_firstColumn; bool m_enabled; @@ -1508,7 +1508,7 @@ void moveColumns(const std::set &indices, int delta) { //----------------------------------------------------------------------------- -class ColumnMoveUndo : public TUndo { +class ColumnMoveUndo final : public TUndo { std::set m_indices; int m_delta; @@ -1549,7 +1549,7 @@ public: //----------------------------------------------------------------------------- -class ColumnMoveDragTool : public XsheetGUI::DragTool { +class ColumnMoveDragTool final : public XsheetGUI::DragTool { int m_offset, m_firstCol, m_lastCol; public: @@ -1617,7 +1617,7 @@ XsheetGUI::DragTool *XsheetGUI::DragTool::makeColumnMoveTool( // Parent Change //----------------------------------------------------------------------------- -class ChangePegbarParentUndo : public TUndo { +class ChangePegbarParentUndo final : public TUndo { TStageObjectId m_oldParentId; TStageObjectId m_newParentId; TStageObjectId m_child; @@ -1650,7 +1650,7 @@ public: //----------------------------------------------------------------------------- -class ChangePegbarParentDragTool : public XsheetGUI::DragTool { +class ChangePegbarParentDragTool final : public XsheetGUI::DragTool { int m_firstCol, m_lastCol; public: @@ -1709,7 +1709,7 @@ XsheetGUI::DragTool *XsheetGUI::DragTool::makeColumnLinkTool( namespace { -class VolumeDragTool : public XsheetGUI::DragTool { +class VolumeDragTool final : public XsheetGUI::DragTool { int m_index; bool m_enabled; @@ -1765,7 +1765,7 @@ XsheetGUI::DragTool *XsheetGUI::DragTool::makeVolumeDragTool( namespace { -class SoundScrubTool : public XsheetGUI::DragTool { +class SoundScrubTool final : public XsheetGUI::DragTool { TXshSoundColumn *m_soundColumn; int m_startRow; std::pair m_playRange; @@ -1867,7 +1867,7 @@ public: enum CellMovementType { NO_MOVEMENT, INSERT_CELLS, OVERWRITE_CELLS }; -class DataDragTool : public XsheetGUI::DragTool { +class DataDragTool final : public XsheetGUI::DragTool { DragAndDropData *m_data; bool m_valid; TPoint m_curPos; diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.h index 21b3089..83a7b4c 100644 --- a/toonz/sources/toonz/xsheetviewer.h +++ b/toonz/sources/toonz/xsheetviewer.h @@ -127,7 +127,7 @@ const QColor CurrentFrameBGColor(210, 210, 210); // XsheetScrollArea //----------------------------------------------------------------------------- -class XsheetScrollArea : public QScrollArea { +class XsheetScrollArea final : public QScrollArea { Q_OBJECT public: @@ -154,7 +154,7 @@ protected: //! Note: some refactoring is needed. XsheetViewer is going to derive from //! SpreadsheetViewer. -class XsheetViewer : public QFrame, public Spreadsheet::FrameScroller { +class XsheetViewer final : public QFrame, public Spreadsheet::FrameScroller { Q_OBJECT QColor m_lightLightBgColor; diff --git a/toonz/sources/toonz/xshnoteviewer.h b/toonz/sources/toonz/xshnoteviewer.h index a465a0d..d2d4cc4 100644 --- a/toonz/sources/toonz/xshnoteviewer.h +++ b/toonz/sources/toonz/xshnoteviewer.h @@ -31,7 +31,7 @@ namespace XsheetGUI { // NotePopup //----------------------------------------------------------------------------- -class NotePopup : public DVGui::Dialog { +class NotePopup final : public DVGui::Dialog { Q_OBJECT XsheetViewer *m_viewer; int m_noteIndex; @@ -83,7 +83,7 @@ protected slots: // NoteWidget //----------------------------------------------------------------------------- -class NoteWidget : public QWidget { +class NoteWidget final : public QWidget { Q_OBJECT XsheetViewer *m_viewer; int m_noteIndex; @@ -111,7 +111,7 @@ protected: // NoteArea //----------------------------------------------------------------------------- -class NoteArea : public QFrame { +class NoteArea final : public QFrame { Q_OBJECT std::unique_ptr m_newNotePopup; // Popup used to create new note diff --git a/toonz/sources/toonz/xshrowviewer.h b/toonz/sources/toonz/xshrowviewer.h index 038c92d..a486a22 100644 --- a/toonz/sources/toonz/xshrowviewer.h +++ b/toonz/sources/toonz/xshrowviewer.h @@ -18,7 +18,7 @@ class DragTool; //----------------------------------------------------------------------------- //! La classe si occupa della visualizzazione dell'area che gestisce le righe. -class RowArea : public QWidget { +class RowArea final : public QWidget { Q_OBJECT XsheetViewer *m_viewer; int m_xa; diff --git a/toonz/sources/toonzfarm/include/tfarmproxy.h b/toonz/sources/toonzfarm/include/tfarmproxy.h index f1edd1f..4a3b7ad 100644 --- a/toonz/sources/toonzfarm/include/tfarmproxy.h +++ b/toonz/sources/toonzfarm/include/tfarmproxy.h @@ -67,7 +67,7 @@ protected: //------------------------------------------------------------------------------ -class CantConnectToStub : public TFarmProxyException { +class CantConnectToStub final : public TFarmProxyException { public: CantConnectToStub(const QString &hostname, const QString &addr, int port) : TFarmProxyException(hostname, addr, port, "") {} diff --git a/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp b/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp index e0b7a3b..6490fe1 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp @@ -14,7 +14,7 @@ namespace { //------------------------------------------------------------------------------ -class Controller : public TFarmController, public TFarmProxy { +class Controller final : public TFarmController, public TFarmProxy { public: Controller(const QString &hostName, const QString &addr, int port) : TFarmProxy(hostName, addr, port) {} diff --git a/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp b/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp index b836272..5d731b4 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp @@ -9,7 +9,7 @@ namespace { //------------------------------------------------------------------------------ -class FarmServerProxy : public TFarmServer, public TFarmProxy { +class FarmServerProxy final : public TFarmServer, public TFarmProxy { public: FarmServerProxy(const QString &hostName, const QString &addr, int port) : TFarmProxy(hostName, addr, port) {} diff --git a/toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp b/toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp index 9f5012f..3f4de3f 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp @@ -11,7 +11,7 @@ using namespace std; //------------------------------------------------------------------------------ -class TFarmServerStub::Imp : public TFarmExecutor { +class TFarmServerStub::Imp final : public TFarmExecutor { public: Imp(TFarmServer *server, int port) : TFarmExecutor(port), m_server(server) { assert(m_server); diff --git a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp index 4a6f854..7897e24 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp @@ -534,7 +534,7 @@ QString TFarmTask::getCommandLine(bool isFarmTask) const { namespace { -class TFarmTaskDeclaration : public TPersistDeclaration { +class TFarmTaskDeclaration final : public TPersistDeclaration { public: TFarmTaskDeclaration(const std::string &id) : TPersistDeclaration(id) {} @@ -748,7 +748,7 @@ void TFarmTaskGroup::saveData(TOStream &os) { namespace { -class TFarmTaskGroupDeclaration : public TPersistDeclaration { +class TFarmTaskGroupDeclaration final : public TPersistDeclaration { public: TFarmTaskGroupDeclaration(const std::string &id) : TPersistDeclaration(id) {} diff --git a/toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp b/toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp index a6e75cd..80fffe0 100644 --- a/toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp +++ b/toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp @@ -267,7 +267,7 @@ static void shutdown_cb(int) { Sthutdown = true; } //--------------------------------------------------------------------- -class DataReader : public TThread::Runnable { +class DataReader final : public TThread::Runnable { public: DataReader(int clientSocket, std::shared_ptr serverImp) : m_clientSocket(clientSocket), m_serverImp(std::move(serverImp)) {} @@ -296,7 +296,7 @@ void DataReader::run() { //--------------------------------------------------------------------- -class DataReceiver : public TThread::Runnable { +class DataReceiver final : public TThread::Runnable { public: DataReceiver(int clientSocket, const QString &data, std::shared_ptr serverImp) diff --git a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp index 3f0c56a..9f219aa 100644 --- a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp +++ b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp @@ -170,7 +170,7 @@ bool isAScript(TFarmTask *task) { //============================================================================== -class CtrlFarmTask : public TFarmTask { +class CtrlFarmTask final : public TFarmTask { public: CtrlFarmTask() : m_toBeDeleted(false), m_failureCount(0) {} @@ -206,7 +206,7 @@ public: namespace { -class TFarmTaskDeclaration : public TPersistDeclaration { +class TFarmTaskDeclaration final : public TPersistDeclaration { public: TFarmTaskDeclaration(const std::string &id) : TPersistDeclaration(id) {} @@ -442,7 +442,7 @@ bool doTestConnection(const QString &hostName, const QString &addr, int port) { //------------------------------------------------------------------------------ #ifdef _WIN32 -class ConnectionTest : public TThread::Runnable { +class ConnectionTest final : public TThread::Runnable { public: ConnectionTest(const FarmServerProxy *server, HANDLE hEvent) : m_server(server), m_hEvent(hEvent) {} @@ -553,7 +553,7 @@ public: //============================================================================== -class FarmController : public TFarmExecutor, public TFarmController { +class FarmController final : public TFarmExecutor, public TFarmController { public: FarmController(const QString &hostName, const QString &addr, int port, TUserLog *log); @@ -1326,7 +1326,7 @@ ServerState FarmController::getServerState(FarmServerProxy *server, //------------------------------------------------------------------------------ -class ServerInitializer : public TThread::Runnable { +class ServerInitializer final : public TThread::Runnable { public: ServerInitializer(FarmServerProxy *server) : m_server(server) {} @@ -1381,7 +1381,7 @@ QString FarmController::addTask(const QString &name, const QString &cmdline, //------------------------------------------------------------------------------ -class TaskStarter : public TThread::Runnable { +class TaskStarter final : public TThread::Runnable { public: TaskStarter(FarmController *controller, CtrlFarmTask *task, FarmServerProxy *server = 0) @@ -2176,7 +2176,7 @@ void FarmController::activateReadyServers() { //============================================================================== -class ControllerService : public TService { +class ControllerService final : public TService { public: ControllerService() : TService("ToonzFarmController", "ToonzFarm Controller") diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index d55d361..51cd4f9 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -171,7 +171,7 @@ inline bool isBlank(char c) { return c == ' ' || c == '\t' || c == '\n'; } //============================================================================== //============================================================================== -class FarmServerService : public TService { +class FarmServerService final : public TService { public: FarmServerService(std::ostream &os) : TService("ToonzFarm Server", "ToonzFarm Server") @@ -208,7 +208,7 @@ FarmServerService service(std::cout); //============================================================================== //============================================================================== -class FarmControllerProxy : public TSmartObject { +class FarmControllerProxy final : public TSmartObject { TFarmController *m_controller; public: @@ -259,7 +259,7 @@ public: //============================================================================== //============================================================================== -class FarmServer : public TFarmExecutor, public TFarmServer { +class FarmServer final : public TFarmExecutor, public TFarmServer { public: FarmServer(int port, TUserLog *log); ~FarmServer(); @@ -326,7 +326,7 @@ private: //=================================================================== //=================================================================== -class Task : public TThread::Runnable { +class Task final : public TThread::Runnable { public: Task(const QString &id, const QString &cmdline, TUserLog *log, FarmServer *server, const FarmControllerProxyP &controller) diff --git a/toonz/sources/toonzlib/cleanupcommon.h b/toonz/sources/toonzlib/cleanupcommon.h index bcac017..12361ed 100644 --- a/toonz/sources/toonzlib/cleanupcommon.h +++ b/toonz/sources/toonzlib/cleanupcommon.h @@ -11,7 +11,7 @@ inline double mmToPixel(double val, double dpi) { return (val * dpi) * (1.0 / 25.4); } -class TCleanupException : public TException { +class TCleanupException final : public TException { public: TCleanupException(const char *msg) : TException(msg) {} ~TCleanupException() {} diff --git a/toonz/sources/toonzlib/doubleparamcmd.cpp b/toonz/sources/toonzlib/doubleparamcmd.cpp index 16ebef0..90016cc 100644 --- a/toonz/sources/toonzlib/doubleparamcmd.cpp +++ b/toonz/sources/toonzlib/doubleparamcmd.cpp @@ -19,7 +19,7 @@ DV_IMPORT_API void splitSpeedInOutSegment(TDoubleKeyframe &k, // //----------------------------------------------------------------------------- -class KeyframesUndo : public TUndo { +class KeyframesUndo final : public TUndo { TDoubleParamP m_param; typedef std::map Keyframes; Keyframes m_oldKeyframes; @@ -802,7 +802,7 @@ void KeyframeSetter::setAllParams( //============================================================================= -class RemoveKeyframeUndo : public TUndo { +class RemoveKeyframeUndo final : public TUndo { TDoubleParam *m_param; TDoubleKeyframe m_keyframe; @@ -832,7 +832,7 @@ void KeyframeSetter::removeKeyframeAt(TDoubleParam *curve, double frame) { //============================================================================= -class EnableCycleUndo : public TUndo { +class EnableCycleUndo final : public TUndo { TDoubleParam *m_param; public: diff --git a/toonz/sources/toonzlib/fxcommand.cpp b/toonz/sources/toonzlib/fxcommand.cpp index 1f91c7a..73cca22 100644 --- a/toonz/sources/toonzlib/fxcommand.cpp +++ b/toonz/sources/toonzlib/fxcommand.cpp @@ -690,7 +690,7 @@ std::vector FxCommandUndo::outputLinks(TXsheet *xsh, // Insert Fx command //********************************************************************** -class InsertFxUndo : public FxCommandUndo { +class InsertFxUndo final : public FxCommandUndo { QList m_selectedFxs; QList m_selectedLinks; @@ -949,7 +949,7 @@ void TFxCommand::addFx(TFx *newFx, const QList &fxs, TApplication *app, // Duplicate Fx command //********************************************************************** -class DuplicateFxUndo : public FxCommandUndo { +class DuplicateFxUndo final : public FxCommandUndo { TFxP m_fx, m_dupFx; TXshColumnP m_column; int m_colIdx; @@ -1080,7 +1080,7 @@ void TFxCommand::duplicateFx(TFx *src, TXsheetHandle *xshHandle, // Replace Fx command //********************************************************************** -class ReplaceFxUndo : public FxCommandUndo { +class ReplaceFxUndo final : public FxCommandUndo { TFxP m_fx, m_repFx, m_linkedFx; TXshColumnP m_column, m_repColumn; int m_colIdx, m_repColIdx; @@ -1314,7 +1314,7 @@ void TFxCommand::replaceFx(TFx *newFx, const QList &fxs, // Unlink Fx command //********************************************************************** -class UnlinkFxUndo : public FxCommandUndo { +class UnlinkFxUndo final : public FxCommandUndo { TFxP m_fx, m_linkedFx; TXsheetHandle *m_xshHandle; @@ -1509,7 +1509,7 @@ void TFxCommand::makeMacroFx(const std::vector &fxs, TApplication *app) { // Explode Macro Fx command //********************************************************************** -class ExplodeMacroUndo : public MakeMacroUndo { +class ExplodeMacroUndo final : public MakeMacroUndo { public: ExplodeMacroUndo(TMacroFx *macro, TApplication *app) : MakeMacroUndo(macro, app) { @@ -1553,7 +1553,7 @@ void TFxCommand::explodeMacroFx(TMacroFx *macroFx, TApplication *app) { // Create Output Fx command //********************************************************************** -class CreateOutputFxUndo : public FxCommandUndo { +class CreateOutputFxUndo final : public FxCommandUndo { TFxP m_outputFx; TXsheetHandle *m_xshHandle; @@ -1723,7 +1723,7 @@ void TFxCommand::connectNodesToXsheet(const std::list &fxs, // Disconnect Nodes From Xsheet command //********************************************************************** -class DisconnectNodesFromXsheetUndo : public ConnectNodesToXsheetUndo { +class DisconnectNodesFromXsheetUndo final : public ConnectNodesToXsheetUndo { public: DisconnectNodesFromXsheetUndo(const std::list &fxs, TXsheetHandle *xshHandle) @@ -2049,7 +2049,7 @@ void deleteLinks(const std::list &links, // Delete Fx command //****************************************************** -class DeleteFxOrColumnUndo : public DeleteLinksUndo { +class DeleteFxOrColumnUndo final : public DeleteLinksUndo { protected: TFxP m_fx; TXshColumnP m_column; @@ -2829,7 +2829,7 @@ void TFxCommand::addPasteFxs(TFx *inFx, const std::list &fxs, // Insert Paste Fxs command //********************************************************************** -class UndoInsertPasteFxs : public UndoAddPasteFxs { +class UndoInsertPasteFxs final : public UndoAddPasteFxs { TFxCommand::Link m_linkOut; //!< Output link to be re-established //!< on redo public: @@ -2919,7 +2919,7 @@ void TFxCommand::insertPasteFxs(const Link &link, const std::list &fxs, // Replace Paste Fxs command //********************************************************************** -class UndoReplacePasteFxs : public UndoAddPasteFxs { +class UndoReplacePasteFxs final : public UndoAddPasteFxs { std::auto_ptr m_deleteFxUndo; TFx *m_fx, *m_rightmostFx; @@ -3211,7 +3211,7 @@ void TFxCommand::disconnectFxs(const std::list &fxs, // Connect Fxs command //********************************************************************** -class UndoConnectFxs : public UndoDisconnectFxs { +class UndoConnectFxs final : public UndoDisconnectFxs { struct GroupData; private: @@ -3355,7 +3355,7 @@ void TFxCommand::connectFxs(const Link &link, const std::list &fxs, // Set Parent command //********************************************************************** -class SetParentUndo : public FxCommandUndo { +class SetParentUndo final : public FxCommandUndo { TFxP m_oldFx, m_newFx, m_parentFx; int m_parentPort; @@ -3483,7 +3483,7 @@ void TFxCommand::setParent(TFx *fx, TFx *parentFx, int parentFxPort, // Rename Fx command //********************************************************************** -class UndoRenameFx : public FxCommandUndo { +class UndoRenameFx final : public FxCommandUndo { TFxP m_fx; std::wstring m_newName, m_oldName; @@ -3661,7 +3661,7 @@ void TFxCommand::groupFxs(const std::list &fxs, // Ungroup Fxs command //********************************************************************** -class UndoUngroupFxs : public UndoGroupFxs { +class UndoUngroupFxs final : public UndoGroupFxs { public: UndoUngroupFxs(int groupId, TXsheetHandle *xshHandle) : UndoGroupFxs(groupId, xshHandle) { @@ -3748,7 +3748,7 @@ void TFxCommand::ungroupFxs(int groupId, TXsheetHandle *xshHandle) { // Rename Group command //********************************************************************** -class UndoRenameGroup : public FxCommandUndo { +class UndoRenameGroup final : public FxCommandUndo { std::vector m_groupData; std::wstring m_oldGroupName, m_newGroupName; diff --git a/toonz/sources/toonzlib/ikjacobian.cpp b/toonz/sources/toonzlib/ikjacobian.cpp index 61316aa..94f9bea 100644 --- a/toonz/sources/toonzlib/ikjacobian.cpp +++ b/toonz/sources/toonzlib/ikjacobian.cpp @@ -533,7 +533,7 @@ void MatrixRmn::PostApplyGivens(double c, double s, long idx1, long idx2) { // Diagonal entries have all non-zero entries before all zero entries, but are // not // necessarily sorted. (Someday, I will write ComputedSortedSVD -//that +// that // handles // sorting the eigenvalues by magnitude.) // ******************************************************************************************** @@ -717,7 +717,7 @@ void MatrixRmn::SvdHouseholder(double *basePt, long colLength, long numCols, // colStride, rowStride: Householder xforms are stored in "columns" // numZerosSkipped is the number of implicit zeros on the front each // Householder transformation vector (only values supported -//are +// are // 0 and 1). void MatrixRmn::ExpandHouseholders(long numXforms, int numZerosSkipped, const double *basePt, long colStride, diff --git a/toonz/sources/toonzlib/imagebuilders.h b/toonz/sources/toonzlib/imagebuilders.h index 1e6a0b3..93fab92 100644 --- a/toonz/sources/toonzlib/imagebuilders.h +++ b/toonz/sources/toonzlib/imagebuilders.h @@ -28,7 +28,7 @@ class TXshSimpleLevel; for image loading. */ -class ImageLoader : public ImageBuilder { +class ImageLoader final : public ImageBuilder { public: struct BuildExtData { const TXshSimpleLevel *m_sl; //!< TXshSimpleLevel instance associated to an @@ -78,7 +78,7 @@ private: //----------------------------------------------------------------------------- -class ImageRasterizer : public ImageBuilder { +class ImageRasterizer final : public ImageBuilder { public: ImageRasterizer() {} ~ImageRasterizer() {} @@ -92,7 +92,7 @@ protected: //----------------------------------------------------------------------------- -class ImageFiller : public ImageBuilder { +class ImageFiller final : public ImageBuilder { public: ImageFiller() {} ~ImageFiller() {} diff --git a/toonz/sources/toonzlib/movierenderer.cpp b/toonz/sources/toonzlib/movierenderer.cpp index 59534fe..35c6e30 100644 --- a/toonz/sources/toonzlib/movierenderer.cpp +++ b/toonz/sources/toonzlib/movierenderer.cpp @@ -96,7 +96,7 @@ QString getPreviewName(unsigned long renderSessionId) { // MovieRenderer::Imp definition //************************************************************************** -class MovieRenderer::Imp : public TRenderPort, public TSmartObject { +class MovieRenderer::Imp final : public TRenderPort, public TSmartObject { public: ToonzScene *m_scene; TRenderer m_renderer; diff --git a/toonz/sources/toonzlib/multimediarenderer.cpp b/toonz/sources/toonzlib/multimediarenderer.cpp index 888b08f..a27aea8 100644 --- a/toonz/sources/toonzlib/multimediarenderer.cpp +++ b/toonz/sources/toonzlib/multimediarenderer.cpp @@ -41,8 +41,8 @@ std::wstring removeSpaces(const std::wstring &str) { // //--------------------------------------------------------- -class MultimediaRenderer::Imp : public MovieRenderer::Listener, - public TSmartObject { +class MultimediaRenderer::Imp final : public MovieRenderer::Listener, + public TSmartObject { public: ToonzScene *m_scene; TFilePath m_fp; diff --git a/toonz/sources/toonzlib/palettecmd.cpp b/toonz/sources/toonzlib/palettecmd.cpp index 0c5b68c..30a0390 100644 --- a/toonz/sources/toonzlib/palettecmd.cpp +++ b/toonz/sources/toonzlib/palettecmd.cpp @@ -162,7 +162,7 @@ bool areStylesUsed(const set levels, namespace { -class ArrangeStylesUndo : public TUndo { +class ArrangeStylesUndo final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_dstPageIndex; @@ -276,7 +276,7 @@ void PaletteCmd::arrangeStyles(TPaletteHandle *paletteHandle, int dstPageIndex, namespace { //----------------------------------------------------------------------------- -class CreateStyleUndo : public TUndo { +class CreateStyleUndo final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_pageIndex; @@ -394,7 +394,7 @@ namespace { // AddStylesUndo //----------------------------------------------------------------------------- -class AddStylesUndo : public TUndo { +class AddStylesUndo final : public TUndo { TPaletteP m_palette; int m_pageIndex; int m_indexInPage; @@ -523,7 +523,7 @@ void PaletteCmd::eraseStyles(const std::set &levels, typedef std::pair> LevelImages; - struct Undo : public TUndo { + struct Undo final : public TUndo { std::set m_levels; std::vector m_styleIds; @@ -616,7 +616,7 @@ void PaletteCmd::eraseStyles(const std::set &levels, namespace { -class AddPageUndo : public TUndo { +class AddPageUndo final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_pageIndex; @@ -699,7 +699,7 @@ void PaletteCmd::addPage(TPaletteHandle *paletteHandle, std::wstring name, namespace { -class DestroyPageUndo : public TUndo { +class DestroyPageUndo final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_pageIndex; @@ -765,7 +765,7 @@ namespace { // SetReferenceImageUndo //------------------------------------------------------------------- -class SetReferenceImageUndo : public TUndo { +class SetReferenceImageUndo final : public TUndo { TPaletteP m_palette; TPaletteP m_oldPalette, m_newPalette; @@ -1004,7 +1004,7 @@ void PaletteCmd::removeReferenceImage(TPaletteHandle *paletteHandle) { namespace { -class MovePageUndo : public TUndo { +class MovePageUndo final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_srcIndex; @@ -1047,7 +1047,7 @@ void PaletteCmd::movePalettePage(TPaletteHandle *paletteHandle, int srcIndex, namespace { -class RenamePageUndo : public TUndo { +class RenamePageUndo final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_pageIndex; @@ -1108,7 +1108,7 @@ void PaletteCmd::renamePalettePage(TPaletteHandle *paletteHandle, int pageIndex, namespace { -class RenamePaletteStyleUndo : public TUndo { +class RenamePaletteStyleUndo final : public TUndo { TPaletteHandle *m_paletteHandle; // Usato nell'undo e nel redo per lanciare // la notifica di cambiamento int m_styleId; diff --git a/toonz/sources/toonzlib/sandor_fxs/SError.h b/toonz/sources/toonzlib/sandor_fxs/SError.h index e80f67d..527fade 100644 --- a/toonz/sources/toonzlib/sandor_fxs/SError.h +++ b/toonz/sources/toonzlib/sandor_fxs/SError.h @@ -28,7 +28,7 @@ public: } }; -class SMemAllocError : public SError { +class SMemAllocError final : public SError { public: SMemAllocError() : SError(""){}; SMemAllocError(const char *s) : SError(s){}; @@ -41,7 +41,7 @@ public: } }; -class SWriteRasterError : public SError { +class SWriteRasterError final : public SError { public: SWriteRasterError() : SError(""){}; SWriteRasterError(const char *s) : SError(s){}; @@ -54,7 +54,7 @@ public: } }; -class SBlurMatrixError : public SError { +class SBlurMatrixError final : public SError { public: SBlurMatrixError() : SError(""){}; SBlurMatrixError(const char *s) : SError(s){}; @@ -67,7 +67,7 @@ public: } }; -class SFileReadError : public SError { +class SFileReadError final : public SError { public: SFileReadError() : SError(""){}; SFileReadError(const char *s) : SError(s){}; diff --git a/toonz/sources/toonzlib/sandor_fxs/STColSelPic.h b/toonz/sources/toonzlib/sandor_fxs/STColSelPic.h index ef4fa04..7c19959 100644 --- a/toonz/sources/toonzlib/sandor_fxs/STColSelPic.h +++ b/toonz/sources/toonzlib/sandor_fxs/STColSelPic.h @@ -27,7 +27,7 @@ #include "SError.h" template -class CSTColSelPic : public CSTPic

{ +class CSTColSelPic final : public CSTPic

{ public: std::shared_ptr m_sel; diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.h b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.h index 609fa3e..5a56e4a 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.h +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.h @@ -18,7 +18,7 @@ typedef struct color_index_list { unsigned short ci[MAXNBCIL]; } COLOR_INDEX_LIST; -class CYOMBInputParam : public CInputParam { +class CYOMBInputParam final : public CInputParam { public: bool m_isRandomSampling; bool m_isShowSelection; diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h b/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h index 9125bb5..f049c86 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h @@ -85,7 +85,7 @@ public: // void blurPixel(CSTColSelPic& pic, const int xx, const int yy, // const CBlurMatrix& bm, UC_PIXEL& col,const - //UCHAR + // UCHAR // osel); // bool isContourOnPath(const int xx, const int yy, // std::vector::const_iterator diff --git a/toonz/sources/toonzlib/scenefx.cpp b/toonz/sources/toonzlib/scenefx.cpp index c838aac..2c429d3 100644 --- a/toonz/sources/toonzlib/scenefx.cpp +++ b/toonz/sources/toonzlib/scenefx.cpp @@ -58,7 +58,7 @@ is developed from is fixed, a sub-xsheet can be seen as a frame setter <\I> fx. */ -class TimeShuffleFx : public TRasterFx { +class TimeShuffleFx final : public TRasterFx { FX_DECLARATION(TimeShuffleFx) private: @@ -151,7 +151,7 @@ FX_IDENTIFIER_IS_HIDDEN(TimeShuffleFx, "timeShuffleFx") \b not resolved during the rendering-tree expansion procedure. */ -class AffineFx : public TGeometryFx { +class AffineFx final : public TGeometryFx { FX_DECLARATION(AffineFx) private: diff --git a/toonz/sources/toonzlib/scriptbinding_renderer.cpp b/toonz/sources/toonzlib/scriptbinding_renderer.cpp index 3556c0c..be96689 100644 --- a/toonz/sources/toonzlib/scriptbinding_renderer.cpp +++ b/toonz/sources/toonzlib/scriptbinding_renderer.cpp @@ -43,7 +43,7 @@ void valueToIntList(const QScriptValue &arr, QList &list) { //======================================================= -class Renderer::Imp : public TRenderPort { +class Renderer::Imp final : public TRenderPort { public: TScriptBinding::Image *m_outputImage; TScriptBinding::Level *m_outputLevel; diff --git a/toonz/sources/toonzlib/scriptengine.cpp b/toonz/sources/toonzlib/scriptengine.cpp index 02b0c6e..b266a9d 100644 --- a/toonz/sources/toonzlib/scriptengine.cpp +++ b/toonz/sources/toonzlib/scriptengine.cpp @@ -132,7 +132,7 @@ QScriptValue runFunction(QScriptContext *context, QScriptEngine *engine) { //========================================================= -class ScriptEngine::Executor : public QThread { +class ScriptEngine::Executor final : public QThread { ScriptEngine *m_engine; QString m_cmd; diff --git a/toonz/sources/toonzlib/studiopalette.cpp b/toonz/sources/toonzlib/studiopalette.cpp index 9378806..54c0558 100644 --- a/toonz/sources/toonzlib/studiopalette.cpp +++ b/toonz/sources/toonzlib/studiopalette.cpp @@ -202,7 +202,6 @@ StudioPalette *StudioPalette::instance() { //------------------------------------------------------------------- - TFilePath StudioPalette::getLevelPalettesRoot() { return m_root + "Global Palettes"; } diff --git a/toonz/sources/toonzlib/studiopalettecmd.cpp b/toonz/sources/toonzlib/studiopalettecmd.cpp index 232b675..8cf07e9 100644 --- a/toonz/sources/toonzlib/studiopalettecmd.cpp +++ b/toonz/sources/toonzlib/studiopalettecmd.cpp @@ -35,7 +35,7 @@ namespace { //============================================================================= // PaletteAssignUndo : Undo for the "Load into Current Palette" command. -class PaletteAssignUndo : public TUndo { +class PaletteAssignUndo final : public TUndo { TPaletteP m_targetPalette, m_oldPalette, m_newPalette; TPaletteHandle *m_paletteHandle; @@ -74,7 +74,7 @@ public: // StudioPaletteAssignUndo : Undo for the "Replace with Current Palette" // command. -class StudioPaletteAssignUndo : public TUndo { +class StudioPaletteAssignUndo final : public TUndo { TPaletteP m_oldPalette, m_newPalette; TFilePath m_fp; TPaletteHandle *m_paletteHandle; @@ -116,7 +116,7 @@ public: //============================================================================= // DeletePaletteUndo -class DeletePaletteUndo : public TUndo { +class DeletePaletteUndo final : public TUndo { TFilePath m_palettePath; TPaletteP m_palette; @@ -143,7 +143,7 @@ public: //============================================================================= // CreatePaletteUndo -class CreatePaletteUndo : public TUndo { +class CreatePaletteUndo final : public TUndo { TFilePath m_palettePath; TPaletteP m_palette; @@ -170,7 +170,7 @@ public: //============================================================================= // DeleteFolderUndo -class DeleteFolderUndo : public TUndo { +class DeleteFolderUndo final : public TUndo { TFilePath m_path; TFilePathSet m_pathSet; QList m_paletteList; @@ -215,7 +215,7 @@ public: //============================================================================= // CreateFolderUndo -class CreateFolderUndo : public TUndo { +class CreateFolderUndo final : public TUndo { TFilePath m_folderPath; public: @@ -239,7 +239,7 @@ public: //============================================================================= // MovePaletteUndo -class MovePaletteUndo : public TUndo { +class MovePaletteUndo final : public TUndo { TFilePath m_dstPath, m_srcPath; public: @@ -267,7 +267,7 @@ void adaptLevelToPalette(TXshLevelHandle *currentLevelHandle, TPaletteHandle *paletteHandle, TPalette *plt, int tolerance, bool noUndo); -class AdjustIntoCurrentPaletteUndo : public TUndo { +class AdjustIntoCurrentPaletteUndo final : public TUndo { TXshLevelHandle *m_currentLevelHandle; TPaletteHandle *m_paletteHandle; TPaletteP m_oldPalette, m_newPalette; diff --git a/toonz/sources/toonzlib/stylemanager.cpp b/toonz/sources/toonzlib/stylemanager.cpp index a045244..35781c3 100644 --- a/toonz/sources/toonzlib/stylemanager.cpp +++ b/toonz/sources/toonzlib/stylemanager.cpp @@ -46,7 +46,7 @@ void convertRaster32ToImage(TRaster32P ras, QImage *image) { // StyleLoaderTask definition //******************************************************************************** -class CustomStyleManager::StyleLoaderTask : public TThread::Runnable { +class CustomStyleManager::StyleLoaderTask final : public TThread::Runnable { CustomStyleManager *m_manager; TFilePath m_fp; PatternData m_data; diff --git a/toonz/sources/toonzlib/tcenterlineadjustments.cpp b/toonz/sources/toonzlib/tcenterlineadjustments.cpp index 6124632..2ca46b7 100644 --- a/toonz/sources/toonzlib/tcenterlineadjustments.cpp +++ b/toonz/sources/toonzlib/tcenterlineadjustments.cpp @@ -288,7 +288,7 @@ void findRoads(const JointSequenceGraph &JSGraph) { //---------------------------------- // Entering point of a Sequence inside a Junction Area -class EnteringSequence : public Sequence { +class EnteringSequence final : public Sequence { public: TPointD m_direction; // In this case, we keep double m_height; // separated (x,y) and z coords. diff --git a/toonz/sources/toonzlib/tcenterlinepolygonizer.cpp b/toonz/sources/toonzlib/tcenterlinepolygonizer.cpp index 34691cc..d8b0319 100644 --- a/toonz/sources/toonzlib/tcenterlinepolygonizer.cpp +++ b/toonz/sources/toonzlib/tcenterlinepolygonizer.cpp @@ -36,7 +36,7 @@ public: //-------------------------------------------------------------------------- -class RawBorder : public std::vector { +class RawBorder final : public std::vector { int m_xExternal; // x coordinate of a specific vertex in the outer // RawBorder which contains this inner one. TPointD *m_coordinateSums; diff --git a/toonz/sources/toonzlib/tcenterlineskeletonizer.cpp b/toonz/sources/toonzlib/tcenterlineskeletonizer.cpp index 4b06e4a..798eb3d 100644 --- a/toonz/sources/toonzlib/tcenterlineskeletonizer.cpp +++ b/toonz/sources/toonzlib/tcenterlineskeletonizer.cpp @@ -43,7 +43,7 @@ struct VectorizationContext; #include #include -class SSDebugger : public QWidget { +class SSDebugger final : public QWidget { public: VectorizationContext &m_context; @@ -194,7 +194,7 @@ struct EventGreater { } }; -class Timeline +class Timeline final : public std::priority_queue, EventGreater> { public: Timeline() {} diff --git a/toonz/sources/toonzlib/tcenterlinevectP.h b/toonz/sources/toonzlib/tcenterlinevectP.h index eda5f7c..8a8324f 100644 --- a/toonz/sources/toonzlib/tcenterlinevectP.h +++ b/toonz/sources/toonzlib/tcenterlinevectP.h @@ -430,7 +430,7 @@ public: //-------------------------------------------------------------------------- -class JointSequenceGraph : public Graph { +class JointSequenceGraph final : public Graph { public: JointSequenceGraph() {} ~JointSequenceGraph() {} diff --git a/toonz/sources/toonzlib/tcenterlinevectorizerOld.cpp b/toonz/sources/toonzlib/tcenterlinevectorizerOld.cpp index 9387d02..e991366 100644 --- a/toonz/sources/toonzlib/tcenterlinevectorizerOld.cpp +++ b/toonz/sources/toonzlib/tcenterlinevectorizerOld.cpp @@ -1928,7 +1928,7 @@ currNode); *otherNode = *currNode; *currNode = tempNode; // it_temp = - //std::find(junction->m_nodes.begin(), + // std::find(junction->m_nodes.begin(), // junction->m_nodes.end(), currNode); // assert(it_temp != // junction->m_nodes.end()); diff --git a/toonz/sources/toonzlib/tcolumnfx.cpp b/toonz/sources/toonzlib/tcolumnfx.cpp index 6e17dee..99820e8 100644 --- a/toonz/sources/toonzlib/tcolumnfx.cpp +++ b/toonz/sources/toonzlib/tcolumnfx.cpp @@ -713,7 +713,7 @@ void applyCmappedFx(TVectorImageP &vi, // LevelFxResourceBuilder definition //**************************************************************************************** -class LevelFxBuilder : public ResourceBuilder { +class LevelFxBuilder final : public ResourceBuilder { TRasterP m_loadedRas; TPaletteP m_palette; diff --git a/toonz/sources/toonzlib/tnewoutlinevectorize.cpp b/toonz/sources/toonzlib/tnewoutlinevectorize.cpp index 99bd52a..c40d03e 100644 --- a/toonz/sources/toonzlib/tnewoutlinevectorize.cpp +++ b/toonz/sources/toonzlib/tnewoutlinevectorize.cpp @@ -62,7 +62,7 @@ inline TPixelGR16 transparent() { // Mesh stuff //=========================================================== -class Edge : public tcg::Edge { +class Edge final : public tcg::Edge { TPoint m_dirs[2]; TStroke *m_s; @@ -282,7 +282,7 @@ public: //************************************************************************ template -class BordersReader : public TRop::borders::BordersReader { +class BordersReader final : public TRop::borders::BordersReader { public: typedef Pix pixel_type; diff --git a/toonz/sources/toonzlib/tproject.cpp b/toonz/sources/toonzlib/tproject.cpp index 6a73a33..ec9ef5a 100644 --- a/toonz/sources/toonzlib/tproject.cpp +++ b/toonz/sources/toonzlib/tproject.cpp @@ -674,7 +674,7 @@ bool TProject::isAProjectPath(const TFilePath &fp) { namespace { /* -class SimpleProject : public TProject { +class SimpleProject final : public TProject { public: SimpleProject() : TProject(TFilePath("___simpleProject")) { } diff --git a/toonz/sources/toonzlib/tstageobjectcmd.cpp b/toonz/sources/toonzlib/tstageobjectcmd.cpp index a1e8f52..103fc36 100644 --- a/toonz/sources/toonzlib/tstageobjectcmd.cpp +++ b/toonz/sources/toonzlib/tstageobjectcmd.cpp @@ -46,7 +46,7 @@ bool canRemoveFx(const std::set &leaves, TFx *fx) { // //--------------------------------------------------------- -class NewCameraUndo : public TUndo { +class NewCameraUndo final : public TUndo { TStageObjectId m_cameraId, m_oldCurrentId; TStageObject *m_stageObject; TXsheetHandle *m_xshHandle; @@ -99,7 +99,7 @@ private: // //--------------------------------------------------------- -class NewPegbarUndo : public TUndo { +class NewPegbarUndo final : public TUndo { TStageObjectId m_id, m_oldCurrentId; TStageObject *m_stageObject; TXsheetHandle *m_xshHandle; @@ -155,7 +155,7 @@ private: // //------------------------------------------------------------------- -class SetActiveCameraUndo : public TUndo { +class SetActiveCameraUndo final : public TUndo { TStageObjectId m_oldCameraId, m_newCameraId; TXsheetHandle *m_xshHandle; @@ -198,7 +198,7 @@ public: // //------------------------------------------------------------------- -class RemoveSplineUndo : public TUndo { +class RemoveSplineUndo final : public TUndo { TStageObjectId m_id; TStageObjectSpline *m_spline; std::vector m_ids; @@ -255,7 +255,7 @@ public: // //------------------------------------------------------------------- -class NewSplineUndo : public TUndo { +class NewSplineUndo final : public TUndo { TStageObjectId m_id; TStageObjectSpline *m_spline; TXsheetHandle *m_xshHandle; @@ -300,7 +300,7 @@ public: // //------------------------------------------------------------------- -class SplineLinkUndo : public TUndo { +class SplineLinkUndo final : public TUndo { TStageObjectId m_id; TStageObjectSpline *m_spline; TXsheetHandle *m_xshHandle; @@ -344,7 +344,7 @@ public: // //------------------------------------------------------------------- -class RemoveSplineLinkUndo : public TUndo { +class RemoveSplineLinkUndo final : public TUndo { TStageObjectId m_id; TStageObjectSpline *m_spline; TXsheetHandle *m_xshHandle; @@ -393,7 +393,7 @@ public: // //------------------------------------------------------------------- -class RemovePegbarNodeUndo : public TUndo { +class RemovePegbarNodeUndo final : public TUndo { TStageObjectId m_objId; TXshColumnP m_column; TStageObjectParams *m_params; @@ -468,7 +468,7 @@ public: // //------------------------------------------------------------------- -class RemoveColumnsUndo : public TUndo { +class RemoveColumnsUndo final : public TUndo { std::vector m_deletedFx; std::vector m_terminalFx; QMap> m_columnFxConnections; @@ -561,7 +561,7 @@ public: // //------------------------------------------------------------------- -class UndoGroup : public TUndo { +class UndoGroup final : public TUndo { QList m_ids; int m_groupId; QList m_positions; @@ -615,7 +615,7 @@ public: // //------------------------------------------------------------------- -class UndoUngroup : public TUndo { +class UndoUngroup final : public TUndo { QList m_objsId; QList m_positions; int m_groupId; @@ -679,7 +679,7 @@ public: // //------------------------------------------------------------------- -class UndoRenameGroup : public TUndo { +class UndoRenameGroup final : public TUndo { QList m_objs; QList m_positions; std::wstring m_oldGroupName; @@ -734,7 +734,7 @@ public: // //------------------------------------------------------------------- -class UndoStatusChange : public TUndo { +class UndoStatusChange final : public TUndo { TStageObject *m_obj; TStageObject::Status m_oldStatus, m_newStatus; TXsheetHandle *m_xshHandle; @@ -1006,7 +1006,7 @@ public: //------------------------------------------------------------------- -class StageObjectRenameUndo : public SetAttributeUndo { +class StageObjectRenameUndo final : public SetAttributeUndo { public: StageObjectRenameUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, std::string oldName, std::string newName) @@ -1022,7 +1022,7 @@ public: //------------------------------------------------------------------- -class ResetOffsetUndo : public SetAttributeUndo { +class ResetOffsetUndo final : public SetAttributeUndo { public: ResetOffsetUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, const TPointD &oldOffset) @@ -1040,7 +1040,7 @@ public: //------------------------------------------------------------------- -class ResetCenterAndOffsetUndo : public SetAttributeUndo { +class ResetCenterAndOffsetUndo final : public SetAttributeUndo { public: ResetCenterAndOffsetUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, const TPointD &oldOffset) @@ -1058,7 +1058,7 @@ public: //------------------------------------------------------------------- -class SetHandleUndo : public SetAttributeUndo { +class SetHandleUndo final : public SetAttributeUndo { TPointD m_center, m_offset; TXsheetHandle *m_xshHandle; @@ -1087,7 +1087,7 @@ public: //------------------------------------------------------------------- -class SetParentHandleUndo : public SetAttributeUndo { +class SetParentHandleUndo final : public SetAttributeUndo { public: SetParentHandleUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, std::string oldHandle, std::string newHandle) @@ -1105,7 +1105,7 @@ public: typedef std::pair ParentIdAndHandle; -class SetParentUndo : public SetAttributeUndo { +class SetParentUndo final : public SetAttributeUndo { public: SetParentUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, TStageObjectId oldParentId, std::string oldParentHandle, @@ -1128,7 +1128,7 @@ public: //------------------------------------------------------------------- -class ResetPositionUndo : public TUndo { +class ResetPositionUndo final : public TUndo { TXsheetHandle *m_xshHandle; TStageObjectId m_id; TPointD m_center, m_offset; diff --git a/toonz/sources/toonzlib/txsheetexpr.cpp b/toonz/sources/toonzlib/txsheetexpr.cpp index c3e5661..fe7d917 100644 --- a/toonz/sources/toonzlib/txsheetexpr.cpp +++ b/toonz/sources/toonzlib/txsheetexpr.cpp @@ -41,7 +41,7 @@ namespace { //=================================================================== -class ParamDependencyFinder : public TSyntax::CalculatorNodeVisitor { +class ParamDependencyFinder final : public TSyntax::CalculatorNodeVisitor { TDoubleParam *m_possiblyDependentParam; bool m_found; @@ -62,9 +62,9 @@ public: // //------------------------------------------------------------------- -class ParamCalculatorNode : public CalculatorNode, - public TParamObserver, - public boost::noncopyable { +class ParamCalculatorNode final : public CalculatorNode, + public TParamObserver, + public boost::noncopyable { TDoubleParamP m_param; std::auto_ptr m_frame; @@ -117,8 +117,8 @@ public: //------------------------------------------------------------------- -class XsheetDrawingCalculatorNode : public CalculatorNode, - public boost::noncopyable { +class XsheetDrawingCalculatorNode final : public CalculatorNode, + public boost::noncopyable { TXsheet *m_xsh; int m_columnIndex; @@ -154,7 +154,7 @@ public: // //------------------------------------------------------------------- -class XsheetReferencePattern : public Pattern { +class XsheetReferencePattern final : public Pattern { TXsheet *m_xsh; public: @@ -288,7 +288,7 @@ public: //------------------------------------------------------------------- -class FxReferencePattern : public Pattern { +class FxReferencePattern final : public Pattern { TXsheet *m_xsh; public: @@ -415,7 +415,7 @@ public: //------------------------------------------------------------------- -class PlasticVertexPattern : public Pattern { +class PlasticVertexPattern final : public Pattern { TXsheet *m_xsh; /* diff --git a/toonz/sources/toonzlib/xshhandlemanager.h b/toonz/sources/toonzlib/xshhandlemanager.h index b00a5a4..a27d62d 100644 --- a/toonz/sources/toonzlib/xshhandlemanager.h +++ b/toonz/sources/toonzlib/xshhandlemanager.h @@ -18,7 +18,7 @@ class ToonzScene; // XshHandleManager declaration //********************************************************************************* -class XshHandleManager : public HandleManager { +class XshHandleManager final : public HandleManager { TXsheet *m_xsh; public: diff --git a/toonz/sources/toonzqt/docklayout.cpp b/toonz/sources/toonzqt/docklayout.cpp index d505ece..c8de5f4 100644 --- a/toonz/sources/toonzqt/docklayout.cpp +++ b/toonz/sources/toonzqt/docklayout.cpp @@ -113,11 +113,11 @@ DockLayout::~DockLayout() { //------------------------------------- -inline int DockLayout::count() const { return m_items.size(); } +int DockLayout::count() const { return m_items.size(); } //------------------------------------- -inline void DockLayout::addItem(QLayoutItem *item) { +void DockLayout::addItem(QLayoutItem *item) { DockWidget *addedItem = dynamic_cast(item->widget()); // Ensure that added item is effectively a DockWidget type; @@ -145,7 +145,7 @@ inline void DockLayout::addItem(QLayoutItem *item) { //------------------------------------- -inline QLayoutItem *DockLayout::takeAt(int idx) { +QLayoutItem *DockLayout::takeAt(int idx) { if (idx < 0 || idx >= (int)m_items.size()) return 0; QLayoutItem *item = m_items[idx]; @@ -164,7 +164,7 @@ inline QLayoutItem *DockLayout::takeAt(int idx) { //------------------------------------- -inline QLayoutItem *DockLayout::itemAt(int idx) const { +QLayoutItem *DockLayout::itemAt(int idx) const { if (idx >= (int)m_items.size()) return 0; return m_items[idx]; } @@ -175,7 +175,7 @@ QWidget *DockLayout::widgetAt(int idx) const { return itemAt(idx)->widget(); } //------------------------------------- -inline QSize DockLayout::minimumSize() const { +QSize DockLayout::minimumSize() const { if (!m_regions.empty()) { Region *r = m_regions.front(); r->calculateExtremalSizes(); @@ -187,7 +187,7 @@ inline QSize DockLayout::minimumSize() const { //------------------------------------- -inline QSize DockLayout::maximumSize() const { +QSize DockLayout::maximumSize() const { if (!m_regions.empty()) { Region *r = m_regions.front(); r->calculateExtremalSizes(); @@ -199,7 +199,7 @@ inline QSize DockLayout::maximumSize() const { //------------------------------------- -inline QSize DockLayout::sizeHint() const { +QSize DockLayout::sizeHint() const { QSize s(0, 0); int n = m_items.size(); if (n > 0) s = QSize(100, 70); // start with a nice default size @@ -242,7 +242,7 @@ QWidget *DockLayout::containerOf(QPoint point) const { //------------------------------------- -inline void DockLayout::setMaximized(DockWidget *item, bool state) { +void DockLayout::setMaximized(DockWidget *item, bool state) { if (item && state != item->m_maximized) { if (state) { // Maximize @@ -311,7 +311,7 @@ void DockLayout::setGeometry(const QRect &rect) { //! Defines cursors for separators of the layout: if it is not possible to //! move a separator, its cursor must be an arrow. -inline void DockLayout::updateSeparatorCursors() { +void DockLayout::updateSeparatorCursors() { Region *r, *child; unsigned int i, j; @@ -464,21 +464,21 @@ Region::~Region() { //------------------------------------------------------ //! Inserts DockSeparator \b sep in \b this Region -inline void Region::insertSeparator(DockSeparator *sep) { +void Region::insertSeparator(DockSeparator *sep) { m_separators.push_back(sep); } //------------------------------------------------------ //! Removes a DockSeparator from \b this Region -inline void Region::removeSeparator() { +void Region::removeSeparator() { delete m_separators.back(); m_separators.pop_back(); } //------------------------------------------------------ -inline void Region::insertSubRegion(Region *subRegion, int idx) { +void Region::insertSubRegion(Region *subRegion, int idx) { m_childList.insert(m_childList.begin() + idx, subRegion); subRegion->m_parent = this; subRegion->m_orientation = !m_orientation; @@ -487,7 +487,7 @@ inline void Region::insertSubRegion(Region *subRegion, int idx) { //------------------------------------------------------ //! Inserts input \b item before position \b idx. Returns associated new region. -inline Region *Region::insertItem(DockWidget *item, int idx) { +Region *Region::insertItem(DockWidget *item, int idx) { Region *newRegion = new Region(m_owner, item); if (this) insertSubRegion(newRegion, idx); @@ -682,7 +682,7 @@ Region *DockLayout::dockItem(DockWidget *item, Region *r, int idx) { // which may slow down a bit - should be done only after a redistribute() and a // repaint() on // real-time docking. -inline Region *DockLayout::dockItemPrivate(DockWidget *item, Region *r, +Region *DockLayout::dockItemPrivate(DockWidget *item, Region *r, int idx) { // hide minimize button in FlipboolPanel item->onDock(true); @@ -731,7 +731,7 @@ inline Region *DockLayout::dockItemPrivate(DockWidget *item, Region *r, //------------------------------------------------------ //! A region is empty, if contains no item and no children. -inline bool isEmptyRegion(Region *r) { +bool isEmptyRegion(Region *r) { if ((!r->getItem()) && (r->getChildList().size() == 0)) { delete r; // Be', e' un po' improprio, ma funziona... return true; @@ -742,7 +742,7 @@ inline bool isEmptyRegion(Region *r) { //------------------------------------------------------ //! Removes input item from region -inline void Region::removeItem(DockWidget *item) { +void Region::removeItem(DockWidget *item) { if (item == 0) return; unsigned int i; @@ -864,10 +864,10 @@ bool DockLayout::undockItem(DockWidget *item) { //! Search for the \b nearest n-ple from a \b target one, under conditions: //!\b 1) nearest elements belong to \b fixed \b intervals; \b 2) their \b sum is //!\b fixed too. -inline void calculateNearest(std::vector target, - std::vector &nearest, - std::vector> intervals, - double sum) { +void calculateNearest(std::vector target, + std::vector &nearest, + std::vector> intervals, + double sum) { // Solving a small Lagrange multipliers problem to find solution on constraint // (2) assert(target.size() == intervals.size()); @@ -1095,7 +1095,7 @@ int Region::calculateMaximumSize(bool direction, bool recalcChildren) { //------------------------------------------------------ -inline bool Region::addItemSize(DockWidget *item) { +bool Region::addItemSize(DockWidget *item) { int sepWidth = m_owner->spacing(); if (m_orientation == horizontal) { @@ -1146,7 +1146,7 @@ inline bool Region::addItemSize(DockWidget *item) { //------------------------------------------------------ -inline bool Region::subItemSize(DockWidget *item) { +bool Region::subItemSize(DockWidget *item) { int sepWidth = m_owner->spacing(); if (m_orientation == horizontal) { @@ -1208,9 +1208,9 @@ inline bool Region::subItemSize(DockWidget *item) { //! Checks insertion validity of \b item inside \b parentRegion at position \b //! insertionIdx. -inline bool DockLayout::isPossibleInsertion(DockWidget *item, - Region *parentRegion, - int insertionIdx) { +bool DockLayout::isPossibleInsertion(DockWidget *item, + Region *parentRegion, + int insertionIdx) { const int inf = 1000000; int mainWindowWidth = contentsRect().width(); @@ -1266,9 +1266,9 @@ inline bool DockLayout::isPossibleInsertion(DockWidget *item, //! Checks insertion validity of \b item inside \b parentRegion at position \b //! insertionIdx. -inline bool DockLayout::isPossibleRemoval(DockWidget *item, - Region *parentRegion, - int removalIdx) { +bool DockLayout::isPossibleRemoval(DockWidget *item, + Region *parentRegion, + int removalIdx) { // NOTE: parentRegion is necessarily !=0 or there's no need to check anything if (!parentRegion) return true; @@ -1587,9 +1587,9 @@ void Region::restoreGeometry() { //! Allocates a new DockSeparator with input parameters. This function can be //! re-implemented //! to allocate derived DockSeparator classes. -inline DockSeparator *DockDecoAllocator::newSeparator(DockLayout *owner, - bool orientation, - Region *parentRegion) { +DockSeparator *DockDecoAllocator::newSeparator(DockLayout *owner, + bool orientation, + Region *parentRegion) { return new DockSeparator(owner, orientation, parentRegion); } @@ -1597,9 +1597,9 @@ inline DockSeparator *DockDecoAllocator::newSeparator(DockLayout *owner, //! When inheriting a DockLayout class, new custom placeholders gets allocated //! by this method. -inline DockPlaceholder *DockDecoAllocator::newPlaceholder(DockWidget *owner, - Region *r, int idx, - int attributes) { +DockPlaceholder *DockDecoAllocator::newPlaceholder(DockWidget *owner, + Region *r, int idx, + int attributes) { return new DockPlaceholder(owner, r, idx, attributes); } @@ -1608,9 +1608,9 @@ inline DockPlaceholder *DockDecoAllocator::newPlaceholder(DockWidget *owner, // BuildGeometry() method should not be called inside the base contructor - // because it's a virtual method. // So we provide this little inline... -inline DockPlaceholder *DockDecoAllocator::newPlaceBuilt(DockWidget *owner, - Region *r, int idx, - int attributes) { +DockPlaceholder *DockDecoAllocator::newPlaceBuilt(DockWidget *owner, + Region *r, int idx, + int attributes) { DockPlaceholder *res = newPlaceholder(owner, r, idx, attributes); res->buildGeometry(); return res; diff --git a/toonz/sources/toonzqt/docklayout.h b/toonz/sources/toonzqt/docklayout.h index acb3270..9867b5a 100644 --- a/toonz/sources/toonzqt/docklayout.h +++ b/toonz/sources/toonzqt/docklayout.h @@ -70,7 +70,7 @@ public: \sa DockWidget and DockSeparator classes. */ -class DVAPI DockLayout : public QLayout { +class DVAPI DockLayout final : public QLayout { std::vector m_items; std::deque m_regions; diff --git a/toonz/sources/toonzqt/dockwidget.cpp b/toonz/sources/toonzqt/dockwidget.cpp index 74510c9..3f28c25 100644 --- a/toonz/sources/toonzqt/dockwidget.cpp +++ b/toonz/sources/toonzqt/dockwidget.cpp @@ -39,7 +39,7 @@ void DockingCheck::setIsEnabled(bool on) { //======================================================== -class DockingToggleCommand : public MenuItemHandler { +class DockingToggleCommand final : public MenuItemHandler { public: DockingToggleCommand() : MenuItemHandler("MI_DockingCheck") {} diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp index aee0eca..c36ee18 100644 --- a/toonz/sources/toonzqt/dvdialog.cpp +++ b/toonz/sources/toonzqt/dvdialog.cpp @@ -125,7 +125,7 @@ void Separator::paintEvent(QPaintEvent *) { p.drawText(contents.left(), 10, m_name); - //make the line semi-transparent + // make the line semi-transparent QColor lineColor = palette().alternateBase().color(); lineColor.setAlpha(128); diff --git a/toonz/sources/toonzqt/dvscrollwidget.cpp b/toonz/sources/toonzqt/dvscrollwidget.cpp index 070c346..1b5ad01 100644 --- a/toonz/sources/toonzqt/dvscrollwidget.cpp +++ b/toonz/sources/toonzqt/dvscrollwidget.cpp @@ -22,7 +22,7 @@ namespace { -class ScrollLayout : public DummyLayout { +class ScrollLayout final : public DummyLayout { DvScrollWidget *m_scrollWidget; public: diff --git a/toonz/sources/toonzqt/expressionfield.cpp b/toonz/sources/toonzqt/expressionfield.cpp index b60141f..c0816df 100644 --- a/toonz/sources/toonzqt/expressionfield.cpp +++ b/toonz/sources/toonzqt/expressionfield.cpp @@ -22,7 +22,7 @@ using namespace TSyntax; //============================================================================= -class ExpressionField::SyntaxHighlighter : public QSyntaxHighlighter { +class ExpressionField::SyntaxHighlighter final : public QSyntaxHighlighter { const Grammar *m_grammar; public: @@ -95,7 +95,7 @@ public: //============================================================================= -class MyListView : public QListView { +class MyListView final : public QListView { QLabel *m_tooltip; public: diff --git a/toonz/sources/toonzqt/flipconsole.cpp b/toonz/sources/toonzqt/flipconsole.cpp index 6febdfc..706bb6e 100644 --- a/toonz/sources/toonzqt/flipconsole.cpp +++ b/toonz/sources/toonzqt/flipconsole.cpp @@ -577,7 +577,7 @@ void FlipConsole::setActive(bool active) { #define LX 21 #define LY 17 -class DoubleButton : public QToolButton { +class DoubleButton final : public QToolButton { QAction *m_firstAction, *m_secondAction; QIcon::Mode m_firstMode, m_secondMode; QIcon::State m_firstState, m_secondState; diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp index ff75f04..fd00d88 100644 --- a/toonz/sources/toonzqt/functionpanel.cpp +++ b/toonz/sources/toonzqt/functionpanel.cpp @@ -52,7 +52,7 @@ void drawRoundedSquare(QPainter &painter, const QPointF &p, double r) { double norm2(const QPointF &p) { return p.x() * p.x() + p.y() * p.y(); } -class FunctionPanelZoomer : public ImageUtils::ShortcutZoomer { +class FunctionPanelZoomer final : public ImageUtils::ShortcutZoomer { FunctionPanel *m_panel; public: diff --git a/toonz/sources/toonzqt/functionpaneltools.h b/toonz/sources/toonzqt/functionpaneltools.h index 020e7c9..3beea2a 100644 --- a/toonz/sources/toonzqt/functionpaneltools.h +++ b/toonz/sources/toonzqt/functionpaneltools.h @@ -22,7 +22,7 @@ public: virtual void draw(QPainter &p) {} }; -class MoveFrameDragTool : public FunctionPanel::DragTool { +class MoveFrameDragTool final : public FunctionPanel::DragTool { FunctionPanel *m_panel; TFrameHandle *m_frameHandle; @@ -31,7 +31,7 @@ public: void drag(QMouseEvent *e) override; }; -class PanDragTool : public FunctionPanel::DragTool { +class PanDragTool final : public FunctionPanel::DragTool { FunctionPanel *m_panel; QPoint m_oldPos; bool m_xLocked, m_yLocked; @@ -42,7 +42,7 @@ public: void drag(QMouseEvent *e) override; }; -class ZoomDragTool : public FunctionPanel::DragTool { +class ZoomDragTool final : public FunctionPanel::DragTool { FunctionPanel *m_panel; QPoint m_startPos, m_oldPos; int m_zoomType; @@ -57,7 +57,7 @@ public: void release(QMouseEvent *e) override; }; -class RectSelectTool : public FunctionPanel::DragTool { +class RectSelectTool final : public FunctionPanel::DragTool { FunctionPanel *m_panel; TDoubleParam *m_curve; QPoint m_startPos; @@ -74,7 +74,7 @@ public: void draw(QPainter &painter) override; }; -class MovePointDragTool : public FunctionPanel::DragTool { +class MovePointDragTool final : public FunctionPanel::DragTool { FunctionPanel *m_panel; QPoint m_startPos, m_oldPos; double m_deltaFrame; @@ -104,7 +104,7 @@ public: void release(QMouseEvent *e) override; }; -class MoveHandleDragTool : public FunctionPanel::DragTool { +class MoveHandleDragTool final : public FunctionPanel::DragTool { public: typedef FunctionPanel::Handle Handle; @@ -131,7 +131,7 @@ public: void release(QMouseEvent *e) override; }; -class MoveGroupHandleDragTool : public FunctionPanel::DragTool { +class MoveGroupHandleDragTool final : public FunctionPanel::DragTool { public: typedef FunctionPanel::Handle Handle; diff --git a/toonz/sources/toonzqt/functionsegmentviewer.cpp b/toonz/sources/toonzqt/functionsegmentviewer.cpp index f1213ed..eeac2b7 100644 --- a/toonz/sources/toonzqt/functionsegmentviewer.cpp +++ b/toonz/sources/toonzqt/functionsegmentviewer.cpp @@ -60,7 +60,7 @@ FunctionSegmentPage::~FunctionSegmentPage() {} //============================================================================= -class FunctionEmptySegmentPage : public FunctionSegmentPage { +class FunctionEmptySegmentPage final : public FunctionSegmentPage { public: FunctionEmptySegmentPage(FunctionSegmentViewer *parent = 0) : FunctionSegmentPage(parent) {} @@ -657,7 +657,7 @@ bool FunctionExpressionSegmentPage::getGuiValues(std::string &expressionText, //============================================================================= -class FileSegmentPage : public FunctionSegmentPage { +class FileSegmentPage final : public FunctionSegmentPage { DVGui::FileField *m_fileFld; LineEdit *m_fieldIndexFld; LineEdit *m_measureFld; diff --git a/toonz/sources/toonzqt/functionselection.cpp b/toonz/sources/toonzqt/functionselection.cpp index fd11213..da5bf8e 100644 --- a/toonz/sources/toonzqt/functionselection.cpp +++ b/toonz/sources/toonzqt/functionselection.cpp @@ -29,7 +29,7 @@ // //----------------------------------------------------------------------------- -class KeyframesCopyUndo : public TUndo { +class KeyframesCopyUndo final : public TUndo { QMimeData *m_oldData, *m_newData; public: @@ -54,7 +54,7 @@ public: //----------------------------------------------------------------------------- -class KeyframesPasteUndo : public TUndo { +class KeyframesPasteUndo final : public TUndo { struct Column { TDoubleParam *m_param; std::map m_oldKeyframes; @@ -124,7 +124,7 @@ public: //----------------------------------------------------------------------------- -class KeyframesDeleteUndo : public TUndo { +class KeyframesDeleteUndo final : public TUndo { public: struct ColumnKeyframes { TDoubleParam *m_param; @@ -175,7 +175,7 @@ private: //----------------------------------------------------------------------------- -class KeyframesMoveUndo : public TUndo { +class KeyframesMoveUndo final : public TUndo { public: KeyframesMoveUndo() {} ~KeyframesMoveUndo() { diff --git a/toonz/sources/toonzqt/functionsheet.cpp b/toonz/sources/toonzqt/functionsheet.cpp index 94634e6..5294fcb 100644 --- a/toonz/sources/toonzqt/functionsheet.cpp +++ b/toonz/sources/toonzqt/functionsheet.cpp @@ -46,7 +46,7 @@ const int cColHeadersEndY = 87; //!< End of column headers y pos //******************************************************************************** /*--- NumericalColumnsのセグメントの左側のバーをクリックしたとき ---*/ -class MoveChannelsDragTool : public Spreadsheet::DragTool { +class MoveChannelsDragTool final : public Spreadsheet::DragTool { FunctionSheet *m_sheet; std::vector m_setters; int m_oldRow; @@ -125,7 +125,7 @@ public: //----------------------------------------------------------------------------- /*--- NumericalColumnsのセル部分をクリックしたとき ---*/ -class FunctionSheetSelectionTool : public Spreadsheet::DragTool { +class FunctionSheetSelectionTool final : public Spreadsheet::DragTool { int m_firstRow, m_firstCol; FunctionSheet *m_sheet; @@ -897,7 +897,7 @@ void FunctionSheetCellViewer::openContextMenu(QMouseEvent *e) { // FunctionSheetColumnToCurveMapper implementation //******************************************************************************** -class FunctionSheetColumnToCurveMapper : public ColumnToCurveMapper { +class FunctionSheetColumnToCurveMapper final : public ColumnToCurveMapper { FunctionSheet *m_sheet; public: diff --git a/toonz/sources/toonzqt/functiontreeviewer.cpp b/toonz/sources/toonzqt/functiontreeviewer.cpp index 68a9e02..bcfcd2c 100644 --- a/toonz/sources/toonzqt/functiontreeviewer.cpp +++ b/toonz/sources/toonzqt/functiontreeviewer.cpp @@ -52,8 +52,8 @@ namespace { -class ParamChannelGroup : public FunctionTreeModel::ParamWrapper, - public FunctionTreeModel::ChannelGroup { +class ParamChannelGroup final : public FunctionTreeModel::ParamWrapper, + public FunctionTreeModel::ChannelGroup { public: ParamChannelGroup(TParam *param, const std::wstring &fxId, std::string ¶mName); @@ -64,7 +64,7 @@ public: //============================================================================= -class StageObjectChannelGroup : public FunctionTreeModel::ChannelGroup { +class StageObjectChannelGroup final : public FunctionTreeModel::ChannelGroup { public: TStageObject *m_stageObject; //!< (not owned) Referenced stage object FunctionTreeModel::ChannelGroup @@ -89,7 +89,7 @@ public: //============================================================================= -class SkVDChannelGroup : public FunctionTreeModel::ChannelGroup { +class SkVDChannelGroup final : public FunctionTreeModel::ChannelGroup { public: StageObjectChannelGroup *m_stageObjectGroup; //!< Parent stage object group const QString *m_vxName; //!< The associated vertex name @@ -1182,7 +1182,7 @@ void FunctionTreeModel::onChange(const TParamChange &tpc) { if (!m_paramsChanged) { m_paramsChanged = true; - struct Func : public TFunctorInvoker::BaseFunctor { + struct Func final : public TFunctorInvoker::BaseFunctor { FunctionTreeModel *m_obj; const TParamChange *m_tpc; diff --git a/toonz/sources/toonzqt/fxdata.h b/toonz/sources/toonzqt/fxdata.h index 9d226b0..ed4790b 100644 --- a/toonz/sources/toonzqt/fxdata.h +++ b/toonz/sources/toonzqt/fxdata.h @@ -24,7 +24,7 @@ using namespace TFxCommand; // FxsData declaration //********************************************************************** -class FxsData : public DvMimeData { +class FxsData final : public DvMimeData { QList m_fxs; QMap m_visitedFxs; QMap m_zeraryFxColumnSize; diff --git a/toonz/sources/toonzqt/icongenerator.cpp b/toonz/sources/toonzqt/icongenerator.cpp index ec2b0fb..23e5393 100644 --- a/toonz/sources/toonzqt/icongenerator.cpp +++ b/toonz/sources/toonzqt/icongenerator.cpp @@ -491,7 +491,7 @@ IconRenderer::~IconRenderer() {} // VectorImageIconRenderer class //-------------------------------------- -class VectorImageIconRenderer : public IconRenderer { +class VectorImageIconRenderer final : public IconRenderer { TVectorImageP m_vimage; TXshSimpleLevelP m_sl; TFrameId m_fid; @@ -561,7 +561,7 @@ void VectorImageIconRenderer::run() { // SplineImageIconRenderer class //-------------------------------------- -class SplineIconRenderer : public IconRenderer { +class SplineIconRenderer final : public IconRenderer { TStageObjectSpline *m_spline; public: @@ -622,7 +622,7 @@ void SplineIconRenderer::run() { // RasterImageIconRenderer class //-------------------------------------- -class RasterImageIconRenderer : public IconRenderer { +class RasterImageIconRenderer final : public IconRenderer { TXshSimpleLevelP m_sl; TFrameId m_fid; @@ -656,7 +656,7 @@ void RasterImageIconRenderer::run() { // ToonzImageIconRenderer class //-------------------------------------- -class ToonzImageIconRenderer : public IconRenderer { +class ToonzImageIconRenderer final : public IconRenderer { TXshSimpleLevelP m_sl; TFrameId m_fid; IconGenerator::Settings m_settings; @@ -761,7 +761,7 @@ void ToonzImageIconRenderer::run() { // MeshImageIconRenderer class //-------------------------------------- -class MeshImageIconRenderer : public IconRenderer { +class MeshImageIconRenderer final : public IconRenderer { TMeshImageP m_image; TXshSimpleLevelP m_sl; TFrameId m_fid; @@ -833,7 +833,7 @@ void MeshImageIconRenderer::run() { // XsheetIconRenderer class //---------------------------------- -class XsheetIconRenderer : public IconRenderer { +class XsheetIconRenderer final : public IconRenderer { TXsheet *m_xsheet; int m_row; @@ -894,7 +894,7 @@ void XsheetIconRenderer::run() { // FileIconRenderer class //-------------------------------- -class FileIconRenderer : public IconRenderer { +class FileIconRenderer final : public IconRenderer { TFilePath m_path; TFrameId m_fid; @@ -1227,7 +1227,7 @@ void FileIconRenderer::run() { // SceneIconRenderer class //-------------------------------- -class SceneIconRenderer : public IconRenderer { +class SceneIconRenderer final : public IconRenderer { ToonzScene *m_toonzScene; public: diff --git a/toonz/sources/toonzqt/keyframenavigator.cpp b/toonz/sources/toonzqt/keyframenavigator.cpp index bd42c72..8bc430b 100644 --- a/toonz/sources/toonzqt/keyframenavigator.cpp +++ b/toonz/sources/toonzqt/keyframenavigator.cpp @@ -263,7 +263,7 @@ void ViewerKeyframeNavigator::hideEvent(QHideEvent *e) { namespace { //----------------------------------------------------------------------------- -class UndoPaletteSetKeyFrame : public TUndo { +class UndoPaletteSetKeyFrame final : public TUndo { int m_frame; int m_styleId; TPaletteHandle *m_paletteHandle; diff --git a/toonz/sources/toonzqt/palettedata.h b/toonz/sources/toonzqt/palettedata.h index 241fef4..9e0cf1e 100644 --- a/toonz/sources/toonzqt/palettedata.h +++ b/toonz/sources/toonzqt/palettedata.h @@ -15,7 +15,7 @@ class TPalette; //----------------------------------------------------------------------------- /*! Useful to set data in drag and drop event styles or palette. */ -class PaletteData : public DvMimeData { +class PaletteData final : public DvMimeData { TPalette *m_palette; std::set m_styleIndicesInPage; int m_pageIndex; diff --git a/toonz/sources/toonzqt/palettesscanpopup.h b/toonz/sources/toonzqt/palettesscanpopup.h index b6f5975..8fd87e9 100644 --- a/toonz/sources/toonzqt/palettesscanpopup.h +++ b/toonz/sources/toonzqt/palettesscanpopup.h @@ -22,7 +22,7 @@ // PalettesScanPopup //----------------------------------------------------------------------------- -class DVAPI PalettesScanPopup : public DVGui::Dialog { +class DVAPI PalettesScanPopup final : public DVGui::Dialog { Q_OBJECT DVGui::FileField *m_field; diff --git a/toonz/sources/toonzqt/paletteviewergui.cpp b/toonz/sources/toonzqt/paletteviewergui.cpp index e4ee342..84e7bae 100644 --- a/toonz/sources/toonzqt/paletteviewergui.cpp +++ b/toonz/sources/toonzqt/paletteviewergui.cpp @@ -770,9 +770,9 @@ void PageViewer::paintEvent(QPaintEvent *e) { p.drawRect(indexRect); p.drawText(indexRect, Qt::AlignCenter, QString().setNum(styleIndex)); - //draw "Autopaint for lines" indicator + // draw "Autopaint for lines" indicator if (style->getFlags() != 0) { - QRect aflRect(chipRect.bottomLeft() + QPoint(0,-14), QSize(12,15)); + QRect aflRect(chipRect.bottomLeft() + QPoint(0, -14), QSize(12, 15)); p.drawRect(aflRect); p.drawText(aflRect, Qt::AlignCenter, "A"); } diff --git a/toonz/sources/toonzqt/paramfield.cpp b/toonz/sources/toonzqt/paramfield.cpp index 13aee99..ecfdd97 100644 --- a/toonz/sources/toonzqt/paramfield.cpp +++ b/toonz/sources/toonzqt/paramfield.cpp @@ -61,7 +61,7 @@ public: //----------------------------------------------------------------------------- /*! MeasuredDoubleParamField Undo */ -class MeasuredDoubleParamFieldUndo : public AnimatableFxSettingsUndo { +class MeasuredDoubleParamFieldUndo final : public AnimatableFxSettingsUndo { TDoubleParamP m_param; double m_oldValue, m_newValue; @@ -99,7 +99,7 @@ public: //----------------------------------------------------------------------------- /*! RangeParamField Undo */ -class RangeParamFieldUndo : public AnimatableFxSettingsUndo { +class RangeParamFieldUndo final : public AnimatableFxSettingsUndo { TRangeParamP m_param; DoublePair m_oldValue, m_newValue; @@ -137,7 +137,7 @@ public: //----------------------------------------------------------------------------- /*! PixelParamField Undo */ -class PixelParamFieldUndo : public AnimatableFxSettingsUndo { +class PixelParamFieldUndo final : public AnimatableFxSettingsUndo { TPixelParamP m_param; TPixel32 m_oldValue, m_newValue; @@ -175,7 +175,7 @@ public: //----------------------------------------------------------------------------- /*! PointParamField Undo */ -class PointParamFieldUndo : public AnimatableFxSettingsUndo { +class PointParamFieldUndo final : public AnimatableFxSettingsUndo { TPointParamP m_param; TPointD m_oldValue, m_newValue; @@ -211,7 +211,7 @@ public: //----------------------------------------------------------------------------- /*! EnumParamField Undo */ -class EnumParamFieldUndo : public FxSettingsUndo { +class EnumParamFieldUndo final : public FxSettingsUndo { TIntEnumParamP m_param; std::string m_oldString, m_newString; @@ -245,7 +245,7 @@ public: //----------------------------------------------------------------------------- /*! IntParamFieldのUndo */ -class IntParamFieldUndo : public FxSettingsUndo { +class IntParamFieldUndo final : public FxSettingsUndo { TIntParamP m_param; int m_oldValue, m_newValue; @@ -280,7 +280,7 @@ public: //----------------------------------------------------------------------------- /*! BoolParamFieldのUndo */ -class BoolParamFieldUndo : public FxSettingsUndo { +class BoolParamFieldUndo final : public FxSettingsUndo { TBoolParamP m_param; bool m_newState; @@ -313,7 +313,7 @@ public: //----------------------------------------------------------------------------- /*! SpectrumParamFieldのUndo */ -class SpectrumParamFieldUndo : public AnimatableFxSettingsUndo { +class SpectrumParamFieldUndo final : public AnimatableFxSettingsUndo { TSpectrumParamP m_param; TSpectrum m_oldSpectrum, m_newSpectrum; @@ -354,7 +354,7 @@ public: SpectrumParamFieldは、表示更新時にactualParamとcurrentParamのKeyの数が 一致していなくてはならないので、２つ同時に変更する必要が有る。 */ -class SpectrumParamFieldAddRemoveKeyUndo : public FxSettingsUndo { +class SpectrumParamFieldAddRemoveKeyUndo final : public FxSettingsUndo { TSpectrumParamP m_actualParam; TSpectrumParamP m_currentParam; TSpectrum::ColorKey m_key; @@ -414,7 +414,7 @@ public: //----------------------------------------------------------------------------- /*! StringParamField Undo */ -class StringParamFieldUndo : public FxSettingsUndo { +class StringParamFieldUndo final : public FxSettingsUndo { TStringParamP m_param; std::wstring m_oldValue, m_newValue; @@ -450,7 +450,7 @@ public: //----------------------------------------------------------------------------- /*! ToneCurveParamField Undo */ -class ToneCurveParamFieldUndo : public AnimatableFxSettingsUndo { +class ToneCurveParamFieldUndo final : public AnimatableFxSettingsUndo { TToneCurveParamP m_param; QList m_oldPoints, m_newPoints; @@ -490,7 +490,7 @@ public: 一致していなくてはならないので、２つ同時に変更する必要が有る。 */ -class ToneCurveParamFieldAddRemovePointUndo : public FxSettingsUndo { +class ToneCurveParamFieldAddRemovePointUndo final : public FxSettingsUndo { TToneCurveParamP m_actualParam; TToneCurveParamP m_currentParam; QList m_value; @@ -550,7 +550,7 @@ public: //----------------------------------------------------------------------------- /*! ToneCurveParamField Undo (Linearのトグル) */ -class ToneCurveParamFieldToggleLinearUndo : public FxSettingsUndo { +class ToneCurveParamFieldToggleLinearUndo final : public FxSettingsUndo { TToneCurveParamP m_actualParam; TToneCurveParamP m_currentParam; bool m_newState; diff --git a/toonz/sources/toonzqt/planeviewer.cpp b/toonz/sources/toonzqt/planeviewer.cpp index 400879b..76b28c8 100644 --- a/toonz/sources/toonzqt/planeviewer.cpp +++ b/toonz/sources/toonzqt/planeviewer.cpp @@ -32,7 +32,7 @@ namespace { -struct PlaneViewerZoomer : public ImageUtils::ShortcutZoomer { +struct PlaneViewerZoomer final : public ImageUtils::ShortcutZoomer { PlaneViewerZoomer(PlaneViewer *planeViewer) : ShortcutZoomer(planeViewer) {} private: diff --git a/toonz/sources/toonzqt/pluginhost.cpp b/toonz/sources/toonzqt/pluginhost.cpp index 42215da..faec52f 100644 --- a/toonz/sources/toonzqt/pluginhost.cpp +++ b/toonz/sources/toonzqt/pluginhost.cpp @@ -102,7 +102,7 @@ std::map PluginLoader::create_menu_items( static bool copy_rendering_setting(toonz_rendering_setting_t *dst, const TRenderSettings &src); -class PluginSetupMessage : public TThread::Message { +class PluginSetupMessage final : public TThread::Message { PluginInformation *pi_; public: diff --git a/toonz/sources/toonzqt/pluginhost.h b/toonz/sources/toonzqt/pluginhost.h index e0fe77d..a1b60e0 100644 --- a/toonz/sources/toonzqt/pluginhost.h +++ b/toonz/sources/toonzqt/pluginhost.h @@ -45,7 +45,7 @@ public: class PluginInformation; /* エフェクトのインスタンスを構築するためのクラス */ -struct PluginDeclaration : public TFxDeclaration { +struct PluginDeclaration final : public TFxDeclaration { PluginDeclaration(PluginInformation *pi); TPersist *create() const final override; @@ -117,7 +117,7 @@ public: void release(); }; -class Loader : public QObject { +class Loader final : public QObject { Q_OBJECT; public: @@ -134,7 +134,7 @@ signals: void fixup(); }; -class PluginLoadController : public QObject { +class PluginLoadController final : public QObject { Q_OBJECT; QThread work_entity; @@ -149,7 +149,7 @@ signals: void start(const QString &filepath); }; -class RasterFxPluginHost : public TZeraryFx, public TPluginInterface { +class RasterFxPluginHost final : public TZeraryFx, public TPluginInterface { PluginInformation *pi_; std::vector> inputs_; diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cpp index be39595..9c43447 100644 --- a/toonz/sources/toonzqt/schematicviewer.cpp +++ b/toonz/sources/toonzqt/schematicviewer.cpp @@ -46,7 +46,7 @@ namespace { -class SchematicZoomer : public ImageUtils::ShortcutZoomer { +class SchematicZoomer final : public ImageUtils::ShortcutZoomer { public: SchematicZoomer(QWidget *parent) : ShortcutZoomer(parent) {} diff --git a/toonz/sources/toonzqt/screenboard.cpp b/toonz/sources/toonzqt/screenboard.cpp index 564d818..df45844 100644 --- a/toonz/sources/toonzqt/screenboard.cpp +++ b/toonz/sources/toonzqt/screenboard.cpp @@ -19,7 +19,7 @@ using namespace DVGui; namespace { -class MouseTrackerDrawing : public ScreenBoard::Drawing { +class MouseTrackerDrawing final : public ScreenBoard::Drawing { public: bool acceptScreenEvents(const QRect &rect) const override { return rect.contains(QCursor::pos()); @@ -54,7 +54,7 @@ public: // ScreenWidget implementation //*********************************************************************************** -class ScreenBoard::ScreenWidget : public QWidget { +class ScreenBoard::ScreenWidget final : public QWidget { QList m_drawings; //!< Drawings intersecting the screen bool m_mouseOnScreen; //!< Whether the mouse is inside this screen diff --git a/toonz/sources/toonzqt/stageobjectsdata.cpp b/toonz/sources/toonzqt/stageobjectsdata.cpp index 4e5bd6c..96635a4 100644 --- a/toonz/sources/toonzqt/stageobjectsdata.cpp +++ b/toonz/sources/toonzqt/stageobjectsdata.cpp @@ -189,7 +189,7 @@ TStageObjectId TStageObjectDataElement::restoreObject(TXsheet *xsh, //! Class used to clone a column stage object's relational data inside the stage //! schematic. -class TColumnDataElement : public TStageObjectDataElement { +class TColumnDataElement final : public TStageObjectDataElement { friend class StageObjectsData; TXshColumnP m_column; //!< Column associated with the stage object @@ -341,7 +341,7 @@ TStageObjectId TColumnDataElement::restoreColumn(TXsheet *xsh, int index, //! Class used to clone a camera stage object's relational data inside the stage //! schematic. -class TCameraDataElement : public TStageObjectDataElement { +class TCameraDataElement final : public TStageObjectDataElement { TCamera m_camera; //!< The object's camera public: diff --git a/toonz/sources/toonzqt/stageobjectselection.cpp b/toonz/sources/toonzqt/stageobjectselection.cpp index 2a30315..dff2bed 100644 --- a/toonz/sources/toonzqt/stageobjectselection.cpp +++ b/toonz/sources/toonzqt/stageobjectselection.cpp @@ -21,7 +21,7 @@ #include namespace { -class TPasteSelectionUndo : public TUndo { +class TPasteSelectionUndo final : public TUndo { StageObjectsData *m_objData; int m_index; std::vector m_pastedId; diff --git a/toonz/sources/toonzqt/stageobjectselection.h b/toonz/sources/toonzqt/stageobjectselection.h index 20f207a..4560da7 100644 --- a/toonz/sources/toonzqt/stageobjectselection.h +++ b/toonz/sources/toonzqt/stageobjectselection.h @@ -23,7 +23,7 @@ class SchematicPort; // //--------------------------------------------------------- -class StageObjectSelection : public QObject, public TSelection { +class StageObjectSelection final : public QObject, public TSelection { Q_OBJECT QList> m_selectedLinks; diff --git a/toonz/sources/toonzqt/studiopaletteviewer.cpp b/toonz/sources/toonzqt/studiopaletteviewer.cpp index 81fe127..052335e 100644 --- a/toonz/sources/toonzqt/studiopaletteviewer.cpp +++ b/toonz/sources/toonzqt/studiopaletteviewer.cpp @@ -645,7 +645,7 @@ void StudioPaletteTreeViewer::searchForPalette() { //----------------------------------------------------------------------------- -class InvalidateIconsUndo : public TUndo { +class InvalidateIconsUndo final : public TUndo { TPaletteP m_targetPalette, m_oldPalette, m_newPalette; TXshLevelHandle *m_levelHandle; @@ -670,7 +670,7 @@ public: //----------------------------------------------------------------------------- -class AdjustPaletteDialog : public DVGui::Dialog { +class AdjustPaletteDialog final : public DVGui::Dialog { private: IntField *m_tolerance; diff --git a/toonz/sources/toonzqt/styledata.h b/toonz/sources/toonzqt/styledata.h index 61ab89d..bbbd0f0 100644 --- a/toonz/sources/toonzqt/styledata.h +++ b/toonz/sources/toonzqt/styledata.h @@ -14,7 +14,7 @@ class TColorStyle; // StyleData //----------------------------------------------------------------------------- -class StyleData : public DvMimeData { +class StyleData final : public DvMimeData { std::vector> m_styles; public: diff --git a/toonz/sources/toonzqt/styleeditor.cpp b/toonz/sources/toonzqt/styleeditor.cpp index 809a6d6..8d58968 100644 --- a/toonz/sources/toonzqt/styleeditor.cpp +++ b/toonz/sources/toonzqt/styleeditor.cpp @@ -61,7 +61,7 @@ using namespace StyleEditorGUI; namespace { -class UndoPaletteChange : public TUndo { +class UndoPaletteChange final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; @@ -1856,7 +1856,7 @@ void StyleChooserPage::setRootPath(const TFilePath &rootPath) { // CustomStyleChooser definition //***************************************************************************** -class CustomStyleChooserPage : public StyleChooserPage { +class CustomStyleChooserPage final : public StyleChooserPage { public: CustomStyleChooserPage(QWidget *parent = 0) : StyleChooserPage(parent) {} @@ -1943,7 +1943,7 @@ void CustomStyleChooserPage::onSelect(int index) { // VectorBrushStyleChooser definition //***************************************************************************** -class VectorBrushStyleChooserPage : public StyleChooserPage { +class VectorBrushStyleChooserPage final : public StyleChooserPage { public: VectorBrushStyleChooserPage(QWidget *parent = 0) : StyleChooserPage(parent) { m_chipSize = QSize(60, 25); @@ -2051,7 +2051,7 @@ struct Texture { //----------------------------------------------------------------------------- -class TextureStyleChooserPage : public StyleChooserPage { +class TextureStyleChooserPage final : public StyleChooserPage { static std::vector m_textures; static bool m_loaded; @@ -2183,7 +2183,7 @@ bool TextureStyleChooserPage::event(QEvent *e) { // SpecialStyleChooser definition //***************************************************************************** -class SpecialStyleChooserPage : public StyleChooserPage { +class SpecialStyleChooserPage final : public StyleChooserPage { static std::vector> m_customStyles; static bool m_loaded; diff --git a/toonz/sources/toonzqt/styleindexlineedit.cpp b/toonz/sources/toonzqt/styleindexlineedit.cpp index 2d5ec12..fc50929 100644 --- a/toonz/sources/toonzqt/styleindexlineedit.cpp +++ b/toonz/sources/toonzqt/styleindexlineedit.cpp @@ -13,8 +13,8 @@ using namespace DVGui; //-------------------------------------------------------------------- StyleIndexLineEdit::StyleIndexLineEdit() : m_pltHandle(0) { - // style index will not be more than 4096, but a longer text - // "current" may be input instead of style id + chip width + margin + // style index will not be more than 4096, but a longer text + // "current" may be input instead of style id + chip width + margin setMaximumWidth(fontMetrics().width("current") + 30); setFixedHeight(20); } diff --git a/toonz/sources/toonzqt/styleselection.cpp b/toonz/sources/toonzqt/styleselection.cpp index d029f13..81e823b 100644 --- a/toonz/sources/toonzqt/styleselection.cpp +++ b/toonz/sources/toonzqt/styleselection.cpp @@ -261,7 +261,7 @@ void insertStylesWithoutUndo(TPalette *palette, TPaletteHandle *pltHandle, // PasteStylesUndo //----------------------------------------------------------------------------- -class PasteStylesUndo : public TUndo { +class PasteStylesUndo final : public TUndo { TStyleSelection *m_selection; int m_oldStyleIndex; int m_pageIndex; @@ -333,7 +333,7 @@ public: // DeleteStylesUndo //----------------------------------------------------------------------------- -class DeleteStylesUndo : public TUndo { +class DeleteStylesUndo final : public TUndo { TStyleSelection *m_selection; int m_pageIndex; std::set m_styleIndicesInPage; @@ -409,7 +409,7 @@ public: // CutStylesUndo //----------------------------------------------------------------------------- -class CutStylesUndo : public TUndo { +class CutStylesUndo final : public TUndo { TStyleSelection *m_selection; int m_pageIndex; std::set m_styleIndicesInPage; @@ -771,7 +771,7 @@ namespace { // UndoPasteValues //----------------------------------------------------------------------------- -class UndoPasteValues : public TUndo { +class UndoPasteValues final : public TUndo { TStyleSelection *m_selection; TPaletteHandle *m_paletteHandle; int m_pageIndex; @@ -1198,7 +1198,7 @@ namespace { // UndoBlendColor //----------------------------------------------------------------------------- -class UndoBlendColor : public TUndo { +class UndoBlendColor final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_pageIndex; @@ -1327,7 +1327,7 @@ namespace { // UndoLinkToStudioPalette //----------------------------------------------------------------------------- -class UndoLinkToStudioPalette : public TUndo { +class UndoLinkToStudioPalette final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_pageIndex; @@ -1515,7 +1515,7 @@ void TStyleSelection::toggleKeyframe(int frame) { //----------------------------------------------------------------------------- -class UndoRemoveLink : public TUndo { +class UndoRemoveLink final : public TUndo { TPaletteHandle *m_paletteHandle; TPaletteP m_palette; int m_pageIndex; @@ -1623,7 +1623,7 @@ bool TStyleSelection::removeLink() { } //============================================================================= -class getBackOriginalStyleUndo : public TUndo { +class getBackOriginalStyleUndo final : public TUndo { TStyleSelection m_selection; std::vector m_oldColors, m_newColors; diff --git a/toonz/sources/toonzqt/swatchviewer.cpp b/toonz/sources/toonzqt/swatchviewer.cpp index 7e4bdbe..a58286e 100644 --- a/toonz/sources/toonzqt/swatchviewer.cpp +++ b/toonz/sources/toonzqt/swatchviewer.cpp @@ -66,7 +66,7 @@ a swatch pointer to its associated cache data - the advantage being that cache resources are shared at the same scene zoom.*/ -class SwatchCacheManager : public TFxCacheManagerDelegate { +class SwatchCacheManager final : public TFxCacheManagerDelegate { T_RENDER_RESOURCE_MANAGER unsigned long m_setFxId; @@ -102,7 +102,8 @@ public: // Manager generator //***************************************************************************************** -class SwatchCacheManagerGenerator : public TRenderResourceManagerGenerator { +class SwatchCacheManagerGenerator final + : public TRenderResourceManagerGenerator { 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 7f91e4d..6f1ff7b 100644 --- a/toonz/sources/toonzqt/tdockwindows.cpp +++ b/toonz/sources/toonzqt/tdockwindows.cpp @@ -17,7 +17,7 @@ // Decorations //------------------- -class TDockDecoAllocator : public DockDecoAllocator { +class TDockDecoAllocator final : public DockDecoAllocator { DockSeparator *newSeparator(DockLayout *owner, bool orientation, Region *parentRegion) override; DockPlaceholder *newPlaceholder(DockWidget *owner, Region *r, int idx, @@ -326,7 +326,7 @@ QSize TDockWidget::getDockedMaximumSize() { // Custom Decorations //-------------------------- -class TDockSeparator : public DockSeparator { +class TDockSeparator final : public DockSeparator { public: TDockSeparator(DockLayout *owner, bool orientation, Region *parentRegion) : DockSeparator(owner, orientation, parentRegion) {} @@ -336,7 +336,7 @@ public: //---------------------------------------- -class TDockPlaceholder : public DockPlaceholder { +class TDockPlaceholder final : public DockPlaceholder { QWidget *m_associated[3]; public: diff --git a/toonz/sources/toonzqt/tmessageviewer.cpp b/toonz/sources/toonzqt/tmessageviewer.cpp index 1e7bbb9..70b0ef6 100644 --- a/toonz/sources/toonzqt/tmessageviewer.cpp +++ b/toonz/sources/toonzqt/tmessageviewer.cpp @@ -18,7 +18,7 @@ QIcon gYellowIcon; //------------------------------------------------------------------------- -class MyQListView : public QListView { +class MyQListView final : public QListView { public: MyQListView(QWidget *parent) : QListView(parent) {} @@ -33,7 +33,7 @@ protected: } // namespace -class MySortFilterProxyModel : public QSortFilterProxyModel { +class MySortFilterProxyModel final : public QSortFilterProxyModel { public: MySortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {} diff --git a/toonz/sources/toonzqt/tonecurvefield.cpp b/toonz/sources/toonzqt/tonecurvefield.cpp index 5c93fa5..5ea3f42 100644 --- a/toonz/sources/toonzqt/tonecurvefield.cpp +++ b/toonz/sources/toonzqt/tonecurvefield.cpp @@ -353,8 +353,10 @@ void ChennelCurveEditor::moveCentralControlPoint(int index, double precDistance = (p.x() + d.x()) - precP.x(); // Caso particolare: Punto di controllo corrente == primo visibile, - // Punto di controllo successivo == - //l'ultimo + // Punto di controllo + //successivo + //== + // l'ultimo // visibile if (index == 3 && index + 3 == pointCount - 4) { setPoint(index + 1, @@ -364,8 +366,10 @@ void ChennelCurveEditor::moveCentralControlPoint(int index, if (nextDistance < 0) d = QPointF(nextP.x() - p.x(), d.y()); } // Caso particolare: Punto di controllo corrente == ultimo visibile, - // Punto di controllo precedente == - //primo + // Punto di controllo + //precedente + //== + // primo // visibile else if (index - 3 == 3 && index == pointCount - 4) { setPoint(index - 2,