diff --git a/toonz/sources/image/ffmpeg/tiio_gif.h b/toonz/sources/image/ffmpeg/tiio_gif.h index fd9bff9..59587fa 100644 --- a/toonz/sources/image/ffmpeg/tiio_gif.h +++ b/toonz/sources/image/ffmpeg/tiio_gif.h @@ -21,12 +21,12 @@ public: TLevelWriterGif(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterGif(); // FfmpegBridge* ffmpeg; - void setFrameRate(double fps); + void setFrameRate(double fps) override; TImageWriterP getFrameWriter(TFrameId fid) override; void save(const TImageP &image, int frameIndex); - void saveSoundTrack(TSoundTrack *st); + void saveSoundTrack(TSoundTrack *st) override; static TLevelWriter *create(const TFilePath &path, TPropertyGroup *winfo) { return new TLevelWriterGif(path, winfo); diff --git a/toonz/sources/image/ffmpeg/tiio_mp4.h b/toonz/sources/image/ffmpeg/tiio_mp4.h index 8748037..718faec 100644 --- a/toonz/sources/image/ffmpeg/tiio_mp4.h +++ b/toonz/sources/image/ffmpeg/tiio_mp4.h @@ -19,12 +19,12 @@ class TLevelWriterMp4 : public TLevelWriter { public: TLevelWriterMp4(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterMp4(); - void setFrameRate(double fps); + void setFrameRate(double fps) override; TImageWriterP getFrameWriter(TFrameId fid) override; void save(const TImageP &image, int frameIndex); - void saveSoundTrack(TSoundTrack *st); + void saveSoundTrack(TSoundTrack *st) override; static TLevelWriter *create(const TFilePath &path, TPropertyGroup *winfo) { return new TLevelWriterMp4(path, winfo); diff --git a/toonz/sources/image/ffmpeg/tiio_webm.h b/toonz/sources/image/ffmpeg/tiio_webm.h index 01ff39d..a3c4af7 100644 --- a/toonz/sources/image/ffmpeg/tiio_webm.h +++ b/toonz/sources/image/ffmpeg/tiio_webm.h @@ -18,12 +18,12 @@ class TLevelWriterWebm : public TLevelWriter { public: TLevelWriterWebm(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterWebm(); - void setFrameRate(double fps); + void setFrameRate(double fps) override; TImageWriterP getFrameWriter(TFrameId fid) override; void save(const TImageP &image, int frameIndex); - void saveSoundTrack(TSoundTrack *st); + void saveSoundTrack(TSoundTrack *st) override; static TLevelWriter *create(const TFilePath &path, TPropertyGroup *winfo) { return new TLevelWriterWebm(path, winfo); diff --git a/toonz/sources/image/sprite/tiio_sprite.h b/toonz/sources/image/sprite/tiio_sprite.h index 781141e..e555e06 100644 --- a/toonz/sources/image/sprite/tiio_sprite.h +++ b/toonz/sources/image/sprite/tiio_sprite.h @@ -21,12 +21,12 @@ class TLevelWriterSprite : public TLevelWriter { public: TLevelWriterSprite(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterSprite(); - void setFrameRate(double fps); + void setFrameRate(double fps) override; TImageWriterP getFrameWriter(TFrameId fid) override; void save(const TImageP &image, int frameIndex); - void saveSoundTrack(TSoundTrack *st); + void saveSoundTrack(TSoundTrack *st) override; static TLevelWriter *create(const TFilePath &path, TPropertyGroup *winfo) { return new TLevelWriterSprite(path, winfo); diff --git a/toonz/sources/include/tools/pinchtool.h b/toonz/sources/include/tools/pinchtool.h index ff3e657..0b71270 100644 --- a/toonz/sources/include/tools/pinchtool.h +++ b/toonz/sources/include/tools/pinchtool.h @@ -63,41 +63,41 @@ public: PinchTool(); virtual ~PinchTool(); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } void setShowSelector(bool show) { m_showSelector = show; } - void onEnter(); - void onLeave(); + void onEnter() override; + void onLeave() override; - void updateTranslation(); + void updateTranslation() override; - void draw(); + void draw() override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; void invalidateCursorArea(); - void mouseMove(const TPointD &pos, const TMouseEvent &e); + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; bool moveCursor(const TPointD &pos); bool keyDown(QKeyEvent *) override; - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; // viene usato?? void update(const TGlobalChange &); - void onImageChanged(); + void onImageChanged() override; - int getCursorId() const { return updateCursor(); } - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + int getCursorId() const override { return updateCursor(); } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } }; #endif // PINCHTOOL_H diff --git a/toonz/sources/include/tools/tooloptions.h b/toonz/sources/include/tools/tooloptions.h index d47a829..aad1d58 100644 --- a/toonz/sources/include/tools/tooloptions.h +++ b/toonz/sources/include/tools/tooloptions.h @@ -696,7 +696,7 @@ class ShiftTraceToolOptionBox final : public ToolOptionsBox { void resetGhost(int index); protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; void hideEvent(QShowEvent *); public: diff --git a/toonz/sources/include/toonz/stagevisitor.h b/toonz/sources/include/toonz/stagevisitor.h index f5cbdf4..781491e 100644 --- a/toonz/sources/include/toonz/stagevisitor.h +++ b/toonz/sources/include/toonz/stagevisitor.h @@ -343,7 +343,7 @@ public: void onImage(const Stage::Player &data) override; void onVectorImage(TVectorImage *vi, const Stage::Player &data); - void onRasterImage(TRasterImage *ri, const Stage::Player &data); + void onRasterImage(TRasterImage *ri, const Stage::Player &data) override; void onToonzImage(TToonzImage *ti, const Stage::Player &data); void beginMask() override; diff --git a/toonz/sources/include/toonzqt/schematicviewer.h b/toonz/sources/include/toonzqt/schematicviewer.h index 7d86d72..3e5c552 100644 --- a/toonz/sources/include/toonzqt/schematicviewer.h +++ b/toonz/sources/include/toonzqt/schematicviewer.h @@ -152,9 +152,9 @@ protected: void showEvent(QShowEvent *se) override; void enterEvent(QEvent *e) override; void leaveEvent(QEvent *e) override; - void mouseDoubleClickEvent(QMouseEvent *event); + void mouseDoubleClickEvent(QMouseEvent *event) override; - void tabletEvent(QTabletEvent *e); + void tabletEvent(QTabletEvent *e) override; void touchEvent(QTouchEvent *e, int type); void gestureEvent(QGestureEvent *e); diff --git a/toonz/sources/stdfx/ino_line_blur.cpp b/toonz/sources/stdfx/ino_line_blur.cpp index f005ae4..dbe9632 100644 --- a/toonz/sources/stdfx/ino_line_blur.cpp +++ b/toonz/sources/stdfx/ino_line_blur.cpp @@ -6536,7 +6536,7 @@ public: bBox = bBox.enlarge(static_cast(margin)); } } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -6546,23 +6546,23 @@ public: return ret; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { TRectD bBox(rect); this->get_render_enlarge(frame, info.m_affine, bBox); return TRasterFx::memorySize(bBox, info.m_bpp); } void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; this->get_render_enlarge(frame, infoOnOutput.m_affine, rectOnInput); } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { // return true;/* geometry処理済の画像に加工することになる */ return false; /* ここでの処理後にgeometryがかかる */ } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_line_blur, "inoLineBlurFx"); diff --git a/toonz/sources/stdfx/iwa_bokehfx.h b/toonz/sources/stdfx/iwa_bokehfx.h index c0cdf96..9d3b6f7 100644 --- a/toonz/sources/stdfx/iwa_bokehfx.h +++ b/toonz/sources/stdfx/iwa_bokehfx.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once /*------------------------------------ Iwa_BokehFx @@ -139,11 +139,11 @@ protected: public: Iwa_BokehFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings); + void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; }; -#endif \ No newline at end of file +#endif diff --git a/toonz/sources/stdfx/iwa_bokehreffx.h b/toonz/sources/stdfx/iwa_bokehreffx.h index 4cc453e..88b99e7 100644 --- a/toonz/sources/stdfx/iwa_bokehreffx.h +++ b/toonz/sources/stdfx/iwa_bokehreffx.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once /*------------------------------------ Iwa_BokehRefFx @@ -176,11 +176,11 @@ protected: public: Iwa_BokehRefFx(); - void doCompute(TTile& tile, double frame, const TRenderSettings& settings); + void doCompute(TTile& tile, double frame, const TRenderSettings& settings) override; - bool doGetBBox(double frame, TRectD& bBox, const TRenderSettings& info); + bool doGetBBox(double frame, TRectD& bBox, const TRenderSettings& info) override; - bool canHandle(const TRenderSettings& info, double frame); + bool canHandle(const TRenderSettings& info, double frame) override; void doCompute_CPU(const double frame, const TRenderSettings& settings, float bokehPixelAmount, float maxIrisSize, int margin, diff --git a/toonz/sources/stdfx/iwa_glarefx.h b/toonz/sources/stdfx/iwa_glarefx.h index 2ac6419..1ad79e3 100644 --- a/toonz/sources/stdfx/iwa_glarefx.h +++ b/toonz/sources/stdfx/iwa_glarefx.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once /*------------------------------------ Iwa_GlareFx @@ -89,13 +89,13 @@ protected: public: Iwa_GlareFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings); + void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; void getParamUIs(TParamUIConcept *&concepts, int &length) override; }; -#endif \ No newline at end of file +#endif diff --git a/toonz/sources/tnztools/rasterselectiontool.h b/toonz/sources/tnztools/rasterselectiontool.h index e0f6035..e6f85b0 100644 --- a/toonz/sources/tnztools/rasterselectiontool.h +++ b/toonz/sources/tnztools/rasterselectiontool.h @@ -242,7 +242,7 @@ public: bool onPropertyChanged(std::string propertyName) override; bool getNoAntialiasingValue() { return m_noAntialiasing.getValue(); } - bool isSelectionEditable() { return m_rasterSelection.isEditable(); } + bool isSelectionEditable() override { return m_rasterSelection.isEditable(); } protected: void updateTranslation() override; diff --git a/toonz/sources/tnztools/skeletontool.h b/toonz/sources/tnztools/skeletontool.h index f863a2c..98fc5f3 100644 --- a/toonz/sources/tnztools/skeletontool.h +++ b/toonz/sources/tnztools/skeletontool.h @@ -79,25 +79,25 @@ public: SkeletonTool(); ~SkeletonTool(); - ToolType getToolType() const { return TTool::ColumnTool; } + ToolType getToolType() const override { return TTool::ColumnTool; } - void updateTranslation(); // QString localization stuff + void updateTranslation() override; // QString localization stuff bool doesApply() const; // ritorna vero se posso deformare l'oggetto corrente - void onEnter() {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &, const TMouseEvent &e); + void onEnter() override {} + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &, const TMouseEvent &e) override; - void onImageChanged() { invalidate(); } + void onImageChanged() override { invalidate(); } - void reset() { m_temporaryPinnedColumns.clear(); } + void reset() override { m_temporaryPinnedColumns.clear(); } - bool onPropertyChanged(std::string propertyName); + bool onPropertyChanged(std::string propertyName) override; - void draw(); + void draw() override; void drawSkeleton(const Skeleton &skeleton, int row); void drawLevelBoundingBox(int frame, int columnIndex); @@ -122,21 +122,21 @@ public: bool keyDown(QKeyEvent *event) override; - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; int getMagicLinkCount() const { return (int)m_magicLinks.size(); } SkeletonSubtools::MagicLink getMagicLink(int index) const; void magicLink(int index); - int getCursorId() const; + int getCursorId() const override; // TRaster32P getToolIcon() const {return Pixmaps::arrow;} - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - void updateMatrix() { setMatrix(getCurrentObjectParentMatrix()); } - void addContextMenuItems(QMenu *menu); + void updateMatrix() override { setMatrix(getCurrentObjectParentMatrix()); } + void addContextMenuItems(QMenu *menu) override; bool select(const TSelection *) { return false; } void togglePinnedStatus(int columnIndex, int frame, bool shiftPressed); diff --git a/toonz/sources/tnztools/stylepickertool.h b/toonz/sources/tnztools/stylepickertool.h index 65a46c7..a838631 100644 --- a/toonz/sources/tnztools/stylepickertool.h +++ b/toonz/sources/tnztools/stylepickertool.h @@ -42,7 +42,7 @@ public: int getCursorId() const override; - bool onPropertyChanged(std::string propertyName); + bool onPropertyChanged(std::string propertyName) override; bool isOrganizePaletteActive() { return m_organizePalette.getValue(); } @@ -57,4 +57,4 @@ public: void updateTranslation() override; }; -#endif \ No newline at end of file +#endif diff --git a/toonz/sources/tnztools/vectorselectiontool.h b/toonz/sources/tnztools/vectorselectiontool.h index 94f79e5..ba90050 100644 --- a/toonz/sources/tnztools/vectorselectiontool.h +++ b/toonz/sources/tnztools/vectorselectiontool.h @@ -312,7 +312,7 @@ public: void setResetCenter(bool update) { m_resetCenter = update; } bool canResetCenter() { return m_resetCenter; } - bool isSelectionEditable() { return m_strokeSelection.isEditable(); } + bool isSelectionEditable() override { return m_strokeSelection.isEditable(); } protected: void onActivate() override; diff --git a/toonz/sources/tnztools/viewtools.h b/toonz/sources/tnztools/viewtools.h index 786ee67..61b4560 100644 --- a/toonz/sources/tnztools/viewtools.h +++ b/toonz/sources/tnztools/viewtools.h @@ -37,7 +37,7 @@ public: int getCursorId() const override; - void updateTranslation() { + void updateTranslation() override { m_cameraCentered.setQStringName(tr("Rotate On Camera Center")); } }; diff --git a/toonz/sources/toonz/filebrowserpopup.h b/toonz/sources/toonz/filebrowserpopup.h index c1ac1c9..0e2289a 100644 --- a/toonz/sources/toonz/filebrowserpopup.h +++ b/toonz/sources/toonz/filebrowserpopup.h @@ -218,7 +218,7 @@ protected: void showEvent(QShowEvent *) override; protected slots: - void onFilePathDoubleClicked(const TFilePath &path); + void onFilePathDoubleClicked(const TFilePath &path) override; }; //----------------------------------------------------------------------------- @@ -313,7 +313,7 @@ protected slots: // the selection void onSelectionChanged(TSelection *selection); - void onFilePathDoubleClicked(const TFilePath &path); + void onFilePathDoubleClicked(const TFilePath &path) override; void onPreferenceChanged(const QString &); diff --git a/toonz/sources/toonz/imageviewer.h b/toonz/sources/toonz/imageviewer.h index 895a963..bec3163 100644 --- a/toonz/sources/toonz/imageviewer.h +++ b/toonz/sources/toonz/imageviewer.h @@ -146,10 +146,10 @@ protected: void dragCompare(const QPoint &dp); - void tabletEvent(QTabletEvent *e); + void tabletEvent(QTabletEvent *e) override; void touchEvent(QTouchEvent *e, int type); void gestureEvent(QGestureEvent *e); - bool event(QEvent *e); + bool event(QEvent *e) override; public slots: diff --git a/toonz/sources/toonz/layerheaderpanel.h b/toonz/sources/toonz/layerheaderpanel.h index 70adb6f..1f6b49e 100644 --- a/toonz/sources/toonz/layerheaderpanel.h +++ b/toonz/sources/toonz/layerheaderpanel.h @@ -46,8 +46,8 @@ protected: void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; - void enterEvent(QEvent *); - void leaveEvent(QEvent *); + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; bool event(QEvent *event) override; private: diff --git a/toonz/sources/toonz/penciltestpopup.h b/toonz/sources/toonz/penciltestpopup.h index 389870e..48b65b9 100644 --- a/toonz/sources/toonz/penciltestpopup.h +++ b/toonz/sources/toonz/penciltestpopup.h @@ -279,9 +279,9 @@ public: ~PencilTestPopup(); protected: - void showEvent(QShowEvent* event); - void hideEvent(QHideEvent* event); - void keyPressEvent(QKeyEvent* event); + void showEvent(QShowEvent* event) override; + void hideEvent(QHideEvent* event) override; + void keyPressEvent(QKeyEvent* event) override; bool event(QEvent* e) override; @@ -320,4 +320,4 @@ public slots: void openSaveInFolderPopup(); }; -#endif \ No newline at end of file +#endif diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h index c52d8e3..6cdc904 100644 --- a/toonz/sources/toonz/sceneviewer.h +++ b/toonz/sources/toonz/sceneviewer.h @@ -259,8 +259,8 @@ public: bool canSwapCompared() const; bool isEditPreviewSubcamera() const { return m_editPreviewSubCamera; } - bool getIsFlippedX() const { return m_isFlippedX; } - bool getIsFlippedY() const { return m_isFlippedY; } + bool getIsFlippedX() const override { return m_isFlippedX; } + bool getIsFlippedY() const override { return m_isFlippedY; } void setEditPreviewSubcamera(bool enabled) { m_editPreviewSubCamera = enabled; } @@ -281,10 +281,10 @@ public: void setIsLocator() { m_isLocator = true; } void setIsStyleShortcutSwitchable() { m_isStyleShortcutSwitchable = true; } - int getVGuideCount(); - int getHGuideCount(); - double getVGuide(int index); - double getHGuide(int index); + int getVGuideCount() override; + int getHGuideCount() override; + double getVGuide(int index) override; + double getHGuide(int index) override; void bindFBO() override; void releaseFBO() override; diff --git a/toonz/sources/toonzlib/imagebuilders.h b/toonz/sources/toonzlib/imagebuilders.h index 6a437a0..55a4271 100644 --- a/toonz/sources/toonzlib/imagebuilders.h +++ b/toonz/sources/toonzlib/imagebuilders.h @@ -61,7 +61,7 @@ public: /* Exposed to allow Fid to be updated due to a renumber operation */ - void setFid(const TFrameId &fid); + void setFid(const TFrameId &fid) override; protected: bool getInfo(TImageInfo &info, int imFlags, void *extData) override; diff --git a/toonz/sources/toonzlib/tpalettehandle.cpp b/toonz/sources/toonzlib/tpalettehandle.cpp index 0013507..1fbaa56 100644 --- a/toonz/sources/toonzlib/tpalettehandle.cpp +++ b/toonz/sources/toonzlib/tpalettehandle.cpp @@ -32,7 +32,7 @@ public: void redo() const override { toggleAutopaint(); } - void onAdd() { redo(); } + void onAdd() override { redo(); } int getSize() const override { return sizeof(*this); } @@ -212,4 +212,4 @@ void TPaletteHandle::toggleAutopaint() { if (index > 0) { TUndoManager::manager()->add(new AutopaintToggleUndo(this, index)); } -} \ No newline at end of file +}