summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-02 07:27:27 +0200
committerMontel Laurent <[email protected]>2017-06-02 07:27:27 +0200
commita53e3315d27760b08e3421a170b442deffbfa469 (patch)
tree5533b958dfc66a0bed13da3a9df2376561de0822
parent3b5a08657e598316b271abff5fa2eaa3c86dacb8 (diff)
Use Q_DECL_OVERRIDE
-rw-r--r--commands/imagelib/effects/kpEffectBalanceCommand.h2
-rw-r--r--commands/imagelib/effects/kpEffectBlurSharpenCommand.h2
-rw-r--r--commands/imagelib/effects/kpEffectClearCommand.h8
-rw-r--r--commands/imagelib/effects/kpEffectCommandBase.h8
-rw-r--r--commands/imagelib/effects/kpEffectEmbossCommand.h2
-rw-r--r--commands/imagelib/effects/kpEffectFlattenCommand.h2
-rw-r--r--commands/imagelib/effects/kpEffectGrayscaleCommand.h4
-rw-r--r--commands/imagelib/effects/kpEffectHSVCommand.h2
-rw-r--r--commands/imagelib/effects/kpEffectInvertCommand.h4
-rw-r--r--commands/imagelib/effects/kpEffectReduceColorsCommand.h2
-rw-r--r--commands/imagelib/effects/kpEffectToneEnhanceCommand.h2
-rw-r--r--commands/imagelib/kpDocumentMetaInfoCommand.h6
-rw-r--r--commands/imagelib/transforms/kpTransformFlipCommand.h8
-rw-r--r--commands/imagelib/transforms/kpTransformResizeScaleCommand.h8
-rw-r--r--commands/imagelib/transforms/kpTransformRotateCommand.h8
-rw-r--r--commands/imagelib/transforms/kpTransformSkewCommand.h8
-rw-r--r--commands/kpCommandHistory.h4
-rw-r--r--commands/kpMacroCommand.h6
-rw-r--r--commands/kpNamedCommand.h2
-rw-r--r--commands/tools/flow/kpToolFlowCommand.h6
-rw-r--r--commands/tools/kpToolColorPickerCommand.h8
-rw-r--r--commands/tools/kpToolFloodFillCommand.h8
-rw-r--r--commands/tools/polygonal/kpToolPolygonalCommand.h6
-rw-r--r--commands/tools/rectangular/kpToolRectangularCommand.h6
-rw-r--r--commands/tools/selection/kpAbstractSelectionContentCommand.h2
-rw-r--r--commands/tools/selection/kpToolImageSelectionTransparencyCommand.h6
-rw-r--r--commands/tools/selection/kpToolSelectionCreateCommand.h6
-rw-r--r--commands/tools/selection/kpToolSelectionDestroyCommand.h6
-rw-r--r--commands/tools/selection/kpToolSelectionMoveCommand.h6
-rw-r--r--commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h4
-rw-r--r--commands/tools/selection/kpToolSelectionResizeScaleCommand.h6
-rw-r--r--commands/tools/selection/text/kpToolTextBackspaceCommand.h6
-rw-r--r--commands/tools/selection/text/kpToolTextChangeStyleCommand.h6
-rw-r--r--commands/tools/selection/text/kpToolTextDeleteCommand.h6
-rw-r--r--commands/tools/selection/text/kpToolTextEnterCommand.h6
-rw-r--r--commands/tools/selection/text/kpToolTextGiveContentCommand.h4
-rw-r--r--commands/tools/selection/text/kpToolTextInsertCommand.h6
-rw-r--r--dialogs/imagelib/effects/kpEffectsDialog.h12
-rw-r--r--dialogs/imagelib/kpDocumentMetaInfoDialog.h2
-rw-r--r--dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h2
-rw-r--r--dialogs/imagelib/transforms/kpTransformRotateDialog.h12
-rw-r--r--dialogs/imagelib/transforms/kpTransformSkewDialog.h12
-rw-r--r--dialogs/kpDocumentSaveOptionsPreviewDialog.h6
-rw-r--r--generic/widgets/kpResizeSignallingLabel.h2
-rw-r--r--imagelib/transforms/kpTransformAutoCrop.h6
-rw-r--r--imagelib/transforms/kpTransformCrop_ImageSelection.cpp8
-rw-r--r--kpThumbnail.h6
-rw-r--r--kpViewScrollableContainer.cpp2
-rw-r--r--kpViewScrollableContainer.h16
-rw-r--r--layers/selections/image/kpAbstractImageSelection.h20
-rw-r--r--layers/selections/image/kpEllipticalImageSelection.h16
-rw-r--r--layers/selections/image/kpFreeFormImageSelection.h26
-rw-r--r--layers/selections/image/kpRectangularImageSelection.h18
-rw-r--r--layers/selections/text/kpTextSelection.h32
-rw-r--r--lgpl/generic/widgets/kpColorCellsBase.h24
-rw-r--r--mainWindow/kpMainWindow.h14
-rw-r--r--tools/flow/kpToolBrush.h4
-rw-r--r--tools/flow/kpToolColorEraser.h14
-rw-r--r--tools/flow/kpToolEraser.h8
-rw-r--r--tools/flow/kpToolFlowBase.h20
-rw-r--r--tools/flow/kpToolFlowPixmapBase.h2
-rw-r--r--tools/flow/kpToolPen.h4
-rw-r--r--tools/flow/kpToolSpraycan.h18
-rw-r--r--tools/kpToolColorPicker.h14
-rw-r--r--tools/kpToolFloodFill.h12
-rw-r--r--tools/kpToolZoom.h18
-rw-r--r--tools/polygonal/kpToolCurve.h6
-rw-r--r--tools/polygonal/kpToolLine.h4
-rw-r--r--tools/polygonal/kpToolPolygon.h10
-rw-r--r--tools/polygonal/kpToolPolygonalBase.h22
-rw-r--r--tools/polygonal/kpToolPolyline.h4
-rw-r--r--tools/rectangular/kpToolRectangularBase.h16
-rw-r--r--tools/selection/image/kpAbstractImageSelectionTool.h16
-rw-r--r--tools/selection/image/kpToolEllipticalSelection.h4
-rw-r--r--tools/selection/image/kpToolFreeFormSelection.h4
-rw-r--r--tools/selection/image/kpToolRectSelection.h4
-rw-r--r--tools/selection/kpAbstractSelectionTool.h24
-rw-r--r--tools/selection/text/kpToolText.h60
-rw-r--r--views/kpThumbnailView.h2
-rw-r--r--views/kpUnzoomedThumbnailView.h4
-rw-r--r--views/kpView.h34
-rw-r--r--views/kpZoomedThumbnailView.h4
-rw-r--r--views/kpZoomedView.h4
-rw-r--r--widgets/colorSimilarity/kpColorSimilarityFrame.h6
-rw-r--r--widgets/colorSimilarity/kpColorSimilarityToolBarItem.h4
-rw-r--r--widgets/imagelib/effects/kpEffectBalanceWidget.h10
-rw-r--r--widgets/imagelib/effects/kpEffectBlurSharpenWidget.h10
-rw-r--r--widgets/imagelib/effects/kpEffectEmbossWidget.h10
-rw-r--r--widgets/imagelib/effects/kpEffectFlattenWidget.h10
-rw-r--r--widgets/imagelib/effects/kpEffectHSVWidget.h10
-rw-r--r--widgets/imagelib/effects/kpEffectInvertWidget.h10
-rw-r--r--widgets/imagelib/effects/kpEffectReduceColorsWidget.h10
-rw-r--r--widgets/imagelib/effects/kpEffectToneEnhanceWidget.h10
-rw-r--r--widgets/kpColorCells.h2
-rw-r--r--widgets/kpDualColorButton.h18
-rw-r--r--widgets/kpTransparentColorCell.h10
-rw-r--r--widgets/toolbars/kpColorToolBar.h4
-rw-r--r--widgets/toolbars/kpToolToolBar.cpp2
-rw-r--r--widgets/toolbars/options/kpToolWidgetBase.h6
-rw-r--r--widgets/toolbars/options/kpToolWidgetBrush.h2
-rw-r--r--widgets/toolbars/options/kpToolWidgetEraserSize.h2
-rw-r--r--widgets/toolbars/options/kpToolWidgetFillStyle.h2
-rw-r--r--widgets/toolbars/options/kpToolWidgetLineWidth.h2
-rw-r--r--widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h2
-rw-r--r--widgets/toolbars/options/kpToolWidgetSpraycanSize.h2
105 files changed, 454 insertions, 454 deletions
diff --git a/commands/imagelib/effects/kpEffectBalanceCommand.h b/commands/imagelib/effects/kpEffectBalanceCommand.h
index 44d525b..d2fbec0 100644
--- a/commands/imagelib/effects/kpEffectBalanceCommand.h
+++ b/commands/imagelib/effects/kpEffectBalanceCommand.h
@@ -45,7 +45,7 @@ public:
virtual ~kpEffectBalanceCommand ();
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
protected:
int m_channels;
diff --git a/commands/imagelib/effects/kpEffectBlurSharpenCommand.h b/commands/imagelib/effects/kpEffectBlurSharpenCommand.h
index a14002f..1e89ccd 100644
--- a/commands/imagelib/effects/kpEffectBlurSharpenCommand.h
+++ b/commands/imagelib/effects/kpEffectBlurSharpenCommand.h
@@ -47,7 +47,7 @@ public:
static QString nameForType (kpEffectBlurSharpen::Type type);
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
protected:
kpEffectBlurSharpen::Type m_type;
diff --git a/commands/imagelib/effects/kpEffectClearCommand.h b/commands/imagelib/effects/kpEffectClearCommand.h
index 8053ca2..a9ec2d3 100644
--- a/commands/imagelib/effects/kpEffectClearCommand.h
+++ b/commands/imagelib/effects/kpEffectClearCommand.h
@@ -44,12 +44,12 @@ public:
kpCommandEnvironment *environ);
virtual ~kpEffectClearCommand ();
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
- virtual SizeType size () const;
+ SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
bool m_actOnSelection;
diff --git a/commands/imagelib/effects/kpEffectCommandBase.h b/commands/imagelib/effects/kpEffectCommandBase.h
index b29fa4c..76edff5 100644
--- a/commands/imagelib/effects/kpEffectCommandBase.h
+++ b/commands/imagelib/effects/kpEffectCommandBase.h
@@ -44,12 +44,12 @@ public:
kpCommandEnvironment *environ);
virtual ~kpEffectCommandBase ();
- virtual QString name () const;
- virtual SizeType size () const;
+ QString name () const Q_DECL_OVERRIDE;
+ SizeType size () const Q_DECL_OVERRIDE;
public:
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
public:
// Return true if applyEffect(applyEffect(image)) == image
diff --git a/commands/imagelib/effects/kpEffectEmbossCommand.h b/commands/imagelib/effects/kpEffectEmbossCommand.h
index 834d64e..c450a1e 100644
--- a/commands/imagelib/effects/kpEffectEmbossCommand.h
+++ b/commands/imagelib/effects/kpEffectEmbossCommand.h
@@ -43,7 +43,7 @@ public:
virtual ~kpEffectEmbossCommand ();
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
protected:
int m_strength;
diff --git a/commands/imagelib/effects/kpEffectFlattenCommand.h b/commands/imagelib/effects/kpEffectFlattenCommand.h
index 066cd48..550892c 100644
--- a/commands/imagelib/effects/kpEffectFlattenCommand.h
+++ b/commands/imagelib/effects/kpEffectFlattenCommand.h
@@ -50,7 +50,7 @@ public:
//
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
QColor m_color1, m_color2;
};
diff --git a/commands/imagelib/effects/kpEffectGrayscaleCommand.h b/commands/imagelib/effects/kpEffectGrayscaleCommand.h
index 3a49eea..182a2e8 100644
--- a/commands/imagelib/effects/kpEffectGrayscaleCommand.h
+++ b/commands/imagelib/effects/kpEffectGrayscaleCommand.h
@@ -47,10 +47,10 @@ public:
//
public:
- virtual bool isInvertible () const { return false; }
+ bool isInvertible () const Q_DECL_OVERRIDE { return false; }
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
};
diff --git a/commands/imagelib/effects/kpEffectHSVCommand.h b/commands/imagelib/effects/kpEffectHSVCommand.h
index 7bd9c59..66830f8 100644
--- a/commands/imagelib/effects/kpEffectHSVCommand.h
+++ b/commands/imagelib/effects/kpEffectHSVCommand.h
@@ -41,7 +41,7 @@ public:
kpCommandEnvironment *environ);
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
protected:
double m_hue, m_saturation, m_value;
diff --git a/commands/imagelib/effects/kpEffectInvertCommand.h b/commands/imagelib/effects/kpEffectInvertCommand.h
index 015dbbf..540f6d0 100644
--- a/commands/imagelib/effects/kpEffectInvertCommand.h
+++ b/commands/imagelib/effects/kpEffectInvertCommand.h
@@ -51,10 +51,10 @@ public:
//
public:
- virtual bool isInvertible () const { return true; }
+ bool isInvertible () const Q_DECL_OVERRIDE { return true; }
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
int m_channels;
};
diff --git a/commands/imagelib/effects/kpEffectReduceColorsCommand.h b/commands/imagelib/effects/kpEffectReduceColorsCommand.h
index f86e882..3752ccc 100644
--- a/commands/imagelib/effects/kpEffectReduceColorsCommand.h
+++ b/commands/imagelib/effects/kpEffectReduceColorsCommand.h
@@ -49,7 +49,7 @@ public:
//
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
int m_depth;
bool m_dither;
diff --git a/commands/imagelib/effects/kpEffectToneEnhanceCommand.h b/commands/imagelib/effects/kpEffectToneEnhanceCommand.h
index 619fe7b..ef2d6d5 100644
--- a/commands/imagelib/effects/kpEffectToneEnhanceCommand.h
+++ b/commands/imagelib/effects/kpEffectToneEnhanceCommand.h
@@ -43,7 +43,7 @@ public:
virtual ~kpEffectToneEnhanceCommand ();
protected:
- virtual kpImage applyEffect (const kpImage &image);
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
protected:
double m_granularity, m_amount;
diff --git a/commands/imagelib/kpDocumentMetaInfoCommand.h b/commands/imagelib/kpDocumentMetaInfoCommand.h
index 7636fc8..cceeb14 100644
--- a/commands/imagelib/kpDocumentMetaInfoCommand.h
+++ b/commands/imagelib/kpDocumentMetaInfoCommand.h
@@ -44,11 +44,11 @@ public:
kpCommandEnvironment *environ);
virtual ~kpDocumentMetaInfoCommand ();
- virtual SizeType size () const;
+ SizeType size () const Q_DECL_OVERRIDE;
public:
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
struct kpDocumentMetaInfoCommandPrivate * const d;
diff --git a/commands/imagelib/transforms/kpTransformFlipCommand.h b/commands/imagelib/transforms/kpTransformFlipCommand.h
index b85c86f..fd3a116 100644
--- a/commands/imagelib/transforms/kpTransformFlipCommand.h
+++ b/commands/imagelib/transforms/kpTransformFlipCommand.h
@@ -42,12 +42,12 @@ public:
virtual ~kpTransformFlipCommand ();
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
- virtual SizeType size () const;
+ SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
void flip ();
diff --git a/commands/imagelib/transforms/kpTransformResizeScaleCommand.h b/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
index 59b99ec..8d58020 100644
--- a/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
+++ b/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
@@ -59,8 +59,8 @@ public:
kpCommandEnvironment *environ);
virtual ~kpTransformResizeScaleCommand ();
- virtual QString name () const;
- virtual SizeType size () const;
+ QString name () const Q_DECL_OVERRIDE;
+ SizeType size () const Q_DECL_OVERRIDE;
public:
int newWidth () const;
@@ -79,8 +79,8 @@ private:
void scaleSelectionRegionWithDocument ();
public:
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
protected:
bool m_actOnSelection;
diff --git a/commands/imagelib/transforms/kpTransformRotateCommand.h b/commands/imagelib/transforms/kpTransformRotateCommand.h
index 5583904..e59e487 100644
--- a/commands/imagelib/transforms/kpTransformRotateCommand.h
+++ b/commands/imagelib/transforms/kpTransformRotateCommand.h
@@ -46,12 +46,12 @@ public:
kpCommandEnvironment *environ);
virtual ~kpTransformRotateCommand ();
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
- virtual SizeType size () const;
+ SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
bool m_actOnSelection;
diff --git a/commands/imagelib/transforms/kpTransformSkewCommand.h b/commands/imagelib/transforms/kpTransformSkewCommand.h
index 96fa5ac..5f25dd9 100644
--- a/commands/imagelib/transforms/kpTransformSkewCommand.h
+++ b/commands/imagelib/transforms/kpTransformSkewCommand.h
@@ -46,12 +46,12 @@ public:
kpCommandEnvironment *environ);
virtual ~kpTransformSkewCommand ();
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
- virtual SizeType size () const;
+ SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
bool m_actOnSelection;
diff --git a/commands/kpCommandHistory.h b/commands/kpCommandHistory.h
index ff985cc..8d7d4b9 100644
--- a/commands/kpCommandHistory.h
+++ b/commands/kpCommandHistory.h
@@ -94,8 +94,8 @@ public:
bool execute = true);
public slots:
- virtual void undo ();
- virtual void redo ();
+ void undo () Q_DECL_OVERRIDE;
+ void redo () Q_DECL_OVERRIDE;
protected:
kpMainWindow *m_mainWindow;
diff --git a/commands/kpMacroCommand.h b/commands/kpMacroCommand.h
index 85d7ef1..6d883bd 100644
--- a/commands/kpMacroCommand.h
+++ b/commands/kpMacroCommand.h
@@ -46,10 +46,10 @@ public:
// kpCommand Interface
//
- virtual SizeType size () const;
+ SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
//
diff --git a/commands/kpNamedCommand.h b/commands/kpNamedCommand.h
index d5f54d4..bb26b4b 100644
--- a/commands/kpNamedCommand.h
+++ b/commands/kpNamedCommand.h
@@ -40,7 +40,7 @@ class kpNamedCommand : public kpCommand
public:
kpNamedCommand (const QString &name, kpCommandEnvironment *environ);
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
protected:
QString m_name;
diff --git a/commands/tools/flow/kpToolFlowCommand.h b/commands/tools/flow/kpToolFlowCommand.h
index 3f80871..7f774d1 100644
--- a/commands/tools/flow/kpToolFlowCommand.h
+++ b/commands/tools/flow/kpToolFlowCommand.h
@@ -43,10 +43,10 @@ public:
kpToolFlowCommand (const QString &name, kpCommandEnvironment *environ);
virtual ~kpToolFlowCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
// interface for kpToolFlowBase
void updateBoundingRect (const QPoint &point);
diff --git a/commands/tools/kpToolColorPickerCommand.h b/commands/tools/kpToolColorPickerCommand.h
index 7864386..480514d 100644
--- a/commands/tools/kpToolColorPickerCommand.h
+++ b/commands/tools/kpToolColorPickerCommand.h
@@ -42,12 +42,12 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolColorPickerCommand ();
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
- virtual SizeType size () const;
+ SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
int m_mouseButton;
diff --git a/commands/tools/kpToolFloodFillCommand.h b/commands/tools/kpToolFloodFillCommand.h
index 446eaa4..38d68ae 100644
--- a/commands/tools/kpToolFloodFillCommand.h
+++ b/commands/tools/kpToolFloodFillCommand.h
@@ -48,17 +48,17 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolFloodFillCommand ();
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
// Optimization hack: filling a fresh, unmodified document does not require
// reading any pixels - just set the whole document to
// <color>.
void setFillEntireImage (bool yes = true);
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
kpToolFloodFillCommandPrivate * const d;
diff --git a/commands/tools/polygonal/kpToolPolygonalCommand.h b/commands/tools/polygonal/kpToolPolygonalCommand.h
index bdaedb0..f48cd67 100644
--- a/commands/tools/polygonal/kpToolPolygonalCommand.h
+++ b/commands/tools/polygonal/kpToolPolygonalCommand.h
@@ -54,10 +54,10 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolPolygonalCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
struct kpToolPolygonalCommandPrivate * const d;
diff --git a/commands/tools/rectangular/kpToolRectangularCommand.h b/commands/tools/rectangular/kpToolRectangularCommand.h
index 37394b4..1245998 100644
--- a/commands/tools/rectangular/kpToolRectangularCommand.h
+++ b/commands/tools/rectangular/kpToolRectangularCommand.h
@@ -48,10 +48,10 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolRectangularCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
struct kpToolRectangularCommandPrivate * const d;
diff --git a/commands/tools/selection/kpAbstractSelectionContentCommand.h b/commands/tools/selection/kpAbstractSelectionContentCommand.h
index cc12746..1c3af36 100644
--- a/commands/tools/selection/kpAbstractSelectionContentCommand.h
+++ b/commands/tools/selection/kpAbstractSelectionContentCommand.h
@@ -57,7 +57,7 @@ public:
kpCommandEnvironment *environ);
virtual ~kpAbstractSelectionContentCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
// Note: Returned pointer is only valid for as long as this command is
// alive.
diff --git a/commands/tools/selection/kpToolImageSelectionTransparencyCommand.h b/commands/tools/selection/kpToolImageSelectionTransparencyCommand.h
index e4b9976..ebdb633 100644
--- a/commands/tools/selection/kpToolImageSelectionTransparencyCommand.h
+++ b/commands/tools/selection/kpToolImageSelectionTransparencyCommand.h
@@ -43,10 +43,10 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolImageSelectionTransparencyCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
kpImageSelectionTransparency m_st, m_oldST;
diff --git a/commands/tools/selection/kpToolSelectionCreateCommand.h b/commands/tools/selection/kpToolSelectionCreateCommand.h
index 6d92fb8..fbb32e9 100644
--- a/commands/tools/selection/kpToolSelectionCreateCommand.h
+++ b/commands/tools/selection/kpToolSelectionCreateCommand.h
@@ -45,13 +45,13 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolSelectionCreateCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
const kpAbstractSelection *fromSelection () const;
void setFromSelection (const kpAbstractSelection &fromSelection);
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
kpAbstractSelection *m_fromSelection;
diff --git a/commands/tools/selection/kpToolSelectionDestroyCommand.h b/commands/tools/selection/kpToolSelectionDestroyCommand.h
index 2f9a47f..ffc6103 100644
--- a/commands/tools/selection/kpToolSelectionDestroyCommand.h
+++ b/commands/tools/selection/kpToolSelectionDestroyCommand.h
@@ -44,10 +44,10 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolSelectionDestroyCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
bool m_pushOntoDocument;
diff --git a/commands/tools/selection/kpToolSelectionMoveCommand.h b/commands/tools/selection/kpToolSelectionMoveCommand.h
index 8f8606c..e609808 100644
--- a/commands/tools/selection/kpToolSelectionMoveCommand.h
+++ b/commands/tools/selection/kpToolSelectionMoveCommand.h
@@ -49,10 +49,10 @@ public:
kpAbstractSelection *originalSelectionClone () const;
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
void moveTo (const QPoint &point, bool moveLater = false);
void moveTo (int x, int y, bool moveLater = false);
diff --git a/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h b/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h
index 2ff30f0..a543af7 100644
--- a/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h
+++ b/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.h
@@ -48,8 +48,8 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolSelectionPullFromDocumentCommand ();
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
kpColor m_backgroundColor;
diff --git a/commands/tools/selection/kpToolSelectionResizeScaleCommand.h b/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
index 7b61e66..49ceeee 100644
--- a/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
+++ b/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
@@ -60,7 +60,7 @@ public:
kpToolSelectionResizeScaleCommand (kpCommandEnvironment *environ);
virtual ~kpToolSelectionResizeScaleCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
public:
const kpAbstractSelection *originalSelection () const;
@@ -91,8 +91,8 @@ public:
void finalize ();
public:
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
protected:
kpAbstractSelection *m_originalSelectionPtr;
diff --git a/commands/tools/selection/text/kpToolTextBackspaceCommand.h b/commands/tools/selection/text/kpToolTextBackspaceCommand.h
index 9a1f0e6..087e9b0 100644
--- a/commands/tools/selection/text/kpToolTextBackspaceCommand.h
+++ b/commands/tools/selection/text/kpToolTextBackspaceCommand.h
@@ -49,10 +49,10 @@ public:
void addBackspace ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
protected:
int m_row, m_col;
diff --git a/commands/tools/selection/text/kpToolTextChangeStyleCommand.h b/commands/tools/selection/text/kpToolTextChangeStyleCommand.h
index b2cd011..b54263d 100644
--- a/commands/tools/selection/text/kpToolTextChangeStyleCommand.h
+++ b/commands/tools/selection/text/kpToolTextChangeStyleCommand.h
@@ -42,10 +42,10 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolTextChangeStyleCommand ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
protected:
kpTextStyle m_newTextStyle, m_oldTextStyle;
diff --git a/commands/tools/selection/text/kpToolTextDeleteCommand.h b/commands/tools/selection/text/kpToolTextDeleteCommand.h
index 8c8511c..0c2bf3c 100644
--- a/commands/tools/selection/text/kpToolTextDeleteCommand.h
+++ b/commands/tools/selection/text/kpToolTextDeleteCommand.h
@@ -49,10 +49,10 @@ public:
void addDelete ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
protected:
int m_row, m_col;
diff --git a/commands/tools/selection/text/kpToolTextEnterCommand.h b/commands/tools/selection/text/kpToolTextEnterCommand.h
index 93f6fdd..31d95c0 100644
--- a/commands/tools/selection/text/kpToolTextEnterCommand.h
+++ b/commands/tools/selection/text/kpToolTextEnterCommand.h
@@ -49,10 +49,10 @@ public:
void addEnter ();
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
protected:
int m_row, m_col;
diff --git a/commands/tools/selection/text/kpToolTextGiveContentCommand.h b/commands/tools/selection/text/kpToolTextGiveContentCommand.h
index 247dbcd..07e7aee 100644
--- a/commands/tools/selection/text/kpToolTextGiveContentCommand.h
+++ b/commands/tools/selection/text/kpToolTextGiveContentCommand.h
@@ -51,8 +51,8 @@ public:
kpCommandEnvironment *environ);
virtual ~kpToolTextGiveContentCommand ();
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
};
diff --git a/commands/tools/selection/text/kpToolTextInsertCommand.h b/commands/tools/selection/text/kpToolTextInsertCommand.h
index 7b22bcd..7ec5047 100644
--- a/commands/tools/selection/text/kpToolTextInsertCommand.h
+++ b/commands/tools/selection/text/kpToolTextInsertCommand.h
@@ -42,10 +42,10 @@ public:
void addText (const QString &moreText);
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
protected:
int m_row, m_col;
diff --git a/dialogs/imagelib/effects/kpEffectsDialog.h b/dialogs/imagelib/effects/kpEffectsDialog.h
index 7e37b4b..12108ac 100644
--- a/dialogs/imagelib/effects/kpEffectsDialog.h
+++ b/dialogs/imagelib/effects/kpEffectsDialog.h
@@ -56,13 +56,13 @@ public:
int defaultSelectedEffect = 0);
virtual ~kpEffectsDialog ();
- virtual bool isNoOp () const;
+ bool isNoOp () const Q_DECL_OVERRIDE;
kpEffectCommandBase *createCommand () const;
protected:
- virtual QSize newDimensions () const;
- virtual QImage transformPixmap (const QImage &pixmap,
- int targetWidth, int targetHeight) const;
+ QSize newDimensions () const Q_DECL_OVERRIDE;
+ QImage transformPixmap (const QImage &pixmap,
+ int targetWidth, int targetHeight) const Q_DECL_OVERRIDE;
public:
int selectedEffect () const;
@@ -70,8 +70,8 @@ public slots:
void selectEffect (int which);
protected slots:
- virtual void slotUpdate ();
- virtual void slotUpdateWithWaitCursor ();
+ void slotUpdate () Q_DECL_OVERRIDE;
+ void slotUpdateWithWaitCursor () Q_DECL_OVERRIDE;
void slotDelayedUpdate ();
diff --git a/dialogs/imagelib/kpDocumentMetaInfoDialog.h b/dialogs/imagelib/kpDocumentMetaInfoDialog.h
index 4a15ccb..3741c77 100644
--- a/dialogs/imagelib/kpDocumentMetaInfoDialog.h
+++ b/dialogs/imagelib/kpDocumentMetaInfoDialog.h
@@ -104,7 +104,7 @@ private slots:
void slotFieldsAddRowButtonClicked ();
void slotFieldsDeleteRowButtonClicked ();
- virtual void accept ();
+ void accept () Q_DECL_OVERRIDE;
private:
struct kpDocumentMetaInfoDialogPrivate * const d;
diff --git a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
index 50a3f32..fa054b8 100644
--- a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
+++ b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
@@ -96,7 +96,7 @@ Q_OBJECT
int originalHeight () const;
private slots:
- virtual void accept();
+ void accept() Q_DECL_OVERRIDE;
void setKeepAspectRatio(bool on);
private:
diff --git a/dialogs/imagelib/transforms/kpTransformRotateDialog.h b/dialogs/imagelib/transforms/kpTransformRotateDialog.h
index eca82c9..e8def27 100644
--- a/dialogs/imagelib/transforms/kpTransformRotateDialog.h
+++ b/dialogs/imagelib/transforms/kpTransformRotateDialog.h
@@ -61,20 +61,20 @@ private:
void createAngleGroupBox ();
public:
- virtual bool isNoOp () const;
+ bool isNoOp () const Q_DECL_OVERRIDE;
int angle () const; // 0 <= angle < 360 (clockwise);
private:
- virtual QSize newDimensions () const;
- virtual QImage transformPixmap (const QImage &pixmap,
- int targetWidth, int targetHeight) const;
+ QSize newDimensions () const Q_DECL_OVERRIDE;
+ QImage transformPixmap (const QImage &pixmap,
+ int targetWidth, int targetHeight) const Q_DECL_OVERRIDE;
private slots:
void slotAngleCustomRadioButtonToggled (bool isChecked);
- virtual void slotUpdate ();
+ void slotUpdate () Q_DECL_OVERRIDE;
private slots:
- virtual void accept ();
+ void accept () Q_DECL_OVERRIDE;
private:
QRadioButton *m_antiClockwiseRadioButton,
diff --git a/dialogs/imagelib/transforms/kpTransformSkewDialog.h b/dialogs/imagelib/transforms/kpTransformSkewDialog.h
index 4d219a0..2affe11 100644
--- a/dialogs/imagelib/transforms/kpTransformSkewDialog.h
+++ b/dialogs/imagelib/transforms/kpTransformSkewDialog.h
@@ -49,14 +49,14 @@ private:
void createAngleGroupBox ();
- virtual QSize newDimensions () const;
- virtual QImage transformPixmap (const QImage &image,
- int targetWidth, int targetHeight) const;
+ QSize newDimensions () const Q_DECL_OVERRIDE;
+ QImage transformPixmap (const QImage &image,
+ int targetWidth, int targetHeight) const Q_DECL_OVERRIDE;
void updateLastAngles ();
private slots:
- virtual void slotUpdate ();
+ void slotUpdate () Q_DECL_OVERRIDE;
public:
// These are the angles the users sees in the dialog and...
@@ -70,10 +70,10 @@ public:
int horizontalAngleForPixmapFX () const;
int verticalAngleForPixmapFX () const;
- virtual bool isNoOp () const;
+ bool isNoOp () const Q_DECL_OVERRIDE;
private slots:
- virtual void accept ();
+ void accept () Q_DECL_OVERRIDE;
private:
QSpinBox *m_horizontalSkewInput, *m_verticalSkewInput;
diff --git a/dialogs/kpDocumentSaveOptionsPreviewDialog.h b/dialogs/kpDocumentSaveOptionsPreviewDialog.h
index 1869e0a..a5241fe 100644
--- a/dialogs/kpDocumentSaveOptionsPreviewDialog.h
+++ b/dialogs/kpDocumentSaveOptionsPreviewDialog.h
@@ -66,9 +66,9 @@ public slots:
void updatePixmapPreview ();
protected:
- virtual void closeEvent (QCloseEvent *e);
- virtual void moveEvent (QMoveEvent *e);
- virtual void resizeEvent (QResizeEvent *e);
+ void closeEvent (QCloseEvent *e) Q_DECL_OVERRIDE;
+ void moveEvent (QMoveEvent *e) Q_DECL_OVERRIDE;
+ void resizeEvent (QResizeEvent *e) Q_DECL_OVERRIDE;
protected:
QImage *m_filePixmap;
diff --git a/generic/widgets/kpResizeSignallingLabel.h b/generic/widgets/kpResizeSignallingLabel.h
index 2434fe0..2634a7a 100644
--- a/generic/widgets/kpResizeSignallingLabel.h
+++ b/generic/widgets/kpResizeSignallingLabel.h
@@ -49,7 +49,7 @@ signals:
void resized ();
protected:
- virtual void resizeEvent (QResizeEvent *e);
+ void resizeEvent (QResizeEvent *e) Q_DECL_OVERRIDE;
};
diff --git a/imagelib/transforms/kpTransformAutoCrop.h b/imagelib/transforms/kpTransformAutoCrop.h
index c0742f6..da6c943 100644
--- a/imagelib/transforms/kpTransformAutoCrop.h
+++ b/imagelib/transforms/kpTransformAutoCrop.h
@@ -60,7 +60,7 @@ public:
static QString text(bool actOnSelection, int options);
- virtual SizeType size () const;
+ SizeType size () const Q_DECL_OVERRIDE;
private:
void getUndoImage (const kpTransformAutoCropBorder &border, kpImage **image);
@@ -68,8 +68,8 @@ private:
void deleteUndoImages ();
public:
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
private:
QRect contentsRect () const;
diff --git a/imagelib/transforms/kpTransformCrop_ImageSelection.cpp b/imagelib/transforms/kpTransformCrop_ImageSelection.cpp
index a17302b..9dbe274 100644
--- a/imagelib/transforms/kpTransformCrop_ImageSelection.cpp
+++ b/imagelib/transforms/kpTransformCrop_ImageSelection.cpp
@@ -54,9 +54,9 @@ public:
virtual ~SetDocumentToSelectionImageCommand ();
/* (uninteresting child of macro cmd) */
- virtual QString name () const { return QString(); }
+ QString name () const Q_DECL_OVERRIDE { return QString(); }
- virtual kpCommandSize::SizeType size () const
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE
{
return ImageSize (m_oldImage) +
SelectionSize (m_fromSelectionPtr) +
@@ -65,8 +65,8 @@ public:
// ASSUMPTION: Document has been resized to be the same size as the
// selection.
- virtual void execute ();
- virtual void unexecute ();
+ void execute () Q_DECL_OVERRIDE;
+ void unexecute () Q_DECL_OVERRIDE;
protected:
kpColor m_backgroundColor;
diff --git a/kpThumbnail.h b/kpThumbnail.h
index 1c38140..ae08af6 100644
--- a/kpThumbnail.h
+++ b/kpThumbnail.h
@@ -61,9 +61,9 @@ protected slots:
void slotViewDestroyed ();
protected:
- virtual void resizeEvent (QResizeEvent *e);
- virtual void moveEvent (QMoveEvent *e);
- virtual void closeEvent (QCloseEvent *e);
+ void resizeEvent (QResizeEvent *e) Q_DECL_OVERRIDE;
+ void moveEvent (QMoveEvent *e) Q_DECL_OVERRIDE;
+ void closeEvent (QCloseEvent *e) Q_DECL_OVERRIDE;
signals:
void windowClosed ();
diff --git a/kpViewScrollableContainer.cpp b/kpViewScrollableContainer.cpp
index 0478983..9da3048 100644
--- a/kpViewScrollableContainer.cpp
+++ b/kpViewScrollableContainer.cpp
@@ -70,7 +70,7 @@ class kpOverlay : public QWidget
{
}
- virtual void paintEvent(QPaintEvent *)
+ void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE
{
m_container->drawResizeLines();
}
diff --git a/kpViewScrollableContainer.h b/kpViewScrollableContainer.h
index abd4a7e..6c3c922 100644
--- a/kpViewScrollableContainer.h
+++ b/kpViewScrollableContainer.h
@@ -96,17 +96,17 @@ protected:
void cancel ();
protected:
- virtual void keyReleaseEvent (QKeyEvent *e);
- virtual void mousePressEvent (QMouseEvent *e);
+ void keyReleaseEvent (QKeyEvent *e) Q_DECL_OVERRIDE;
+ void mousePressEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
public:
QPoint viewDeltaPoint () const;
void mouseMovedTo (const QPoint &point, bool dueToDragScroll);
protected:
- virtual void mouseMoveEvent (QMouseEvent *e);
- virtual void mouseReleaseEvent (QMouseEvent *e);
+ void mouseMoveEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
- virtual void enterEvent (QEvent *e);
- virtual void leaveEvent (QEvent *e);
+ void enterEvent (QEvent *e) Q_DECL_OVERRIDE;
+ void leaveEvent (QEvent *e) Q_DECL_OVERRIDE;
protected:
GripType m_type;
@@ -183,8 +183,8 @@ private:
QRect noDragScrollRect () const;
- virtual void wheelEvent(QWheelEvent *e);
- virtual void resizeEvent(QResizeEvent *e);
+ void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE;
+ void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
private slots:
void slotGripBeganDraw ();
diff --git a/layers/selections/image/kpAbstractImageSelection.h b/layers/selections/image/kpAbstractImageSelection.h
index 03ab741..10aa956 100644
--- a/layers/selections/image/kpAbstractImageSelection.h
+++ b/layers/selections/image/kpAbstractImageSelection.h
@@ -88,7 +88,7 @@ protected:
public:
// (Covariant return-type specialization of superclass pure virtual method)
- virtual kpAbstractImageSelection *clone () const = 0;
+ kpAbstractImageSelection *clone () const Q_DECL_OVERRIDE = 0;
virtual ~kpAbstractImageSelection ();
@@ -100,11 +100,11 @@ public:
public:
// You must override this if you have extra serializable fields.
// Remember to call this base implementation before your code.
- virtual bool readFromStream (QDataStream &stream);
+ bool readFromStream (QDataStream &stream) Q_DECL_OVERRIDE;
// You must override this if you have extra serializable fields.
// Remember to call this base implementation before your code.
- virtual void writeToStream (QDataStream &stream) const;
+ void writeToStream (QDataStream &stream) const Q_DECL_OVERRIDE;
//
@@ -112,12 +112,12 @@ public:
//
public:
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
// You must override this, if you have extra fields that take a
// non-constant amount of space, and add the size returned by this
// implementation.
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
// Same as virtual size() (it even calls it) but subtracts the size of the
// baseImage().
@@ -145,8 +145,8 @@ public:
//
public:
- virtual int minimumWidth () const;
- virtual int minimumHeight () const;
+ int minimumWidth () const Q_DECL_OVERRIDE;
+ int minimumHeight () const Q_DECL_OVERRIDE;
//
@@ -199,9 +199,9 @@ public:
public:
// Returns whether there's a non-null base image.
- virtual bool hasContent () const;
+ bool hasContent () const Q_DECL_OVERRIDE;
- virtual void deleteContent ();
+ void deleteContent () Q_DECL_OVERRIDE;
public:
kpImage baseImage () const;
@@ -252,7 +252,7 @@ public:
public:
// (using transparent image)
- virtual void paint (QImage *destPixmap, const QRect &docRect) const;
+ void paint (QImage *destPixmap, const QRect &docRect) const Q_DECL_OVERRIDE;
// (using base image)
void paintWithBaseImage (QImage *destPixmap, const QRect &docRect) const;
diff --git a/layers/selections/image/kpEllipticalImageSelection.h b/layers/selections/image/kpEllipticalImageSelection.h
index ab5ffad..a9b65c0 100644
--- a/layers/selections/image/kpEllipticalImageSelection.h
+++ b/layers/selections/image/kpEllipticalImageSelection.h
@@ -54,7 +54,7 @@ public:
kpEllipticalImageSelection &operator= (const kpEllipticalImageSelection &rhs);
- virtual kpEllipticalImageSelection *clone () const;
+ kpEllipticalImageSelection *clone () const Q_DECL_OVERRIDE;
virtual ~kpEllipticalImageSelection ();
@@ -65,7 +65,7 @@ public:
public:
static const int SerialID = 1;
- virtual int serialID () const;
+ int serialID () const Q_DECL_OVERRIDE;
//
@@ -73,7 +73,7 @@ public:
//
public:
- virtual bool isRectangular () const;
+ bool isRectangular () const Q_DECL_OVERRIDE;
//
@@ -81,7 +81,7 @@ public:
//
public:
- virtual QPolygon calculatePoints () const;
+ QPolygon calculatePoints () const Q_DECL_OVERRIDE;
//
@@ -89,7 +89,7 @@ public:
//
public:
- virtual QRegion shapeRegion () const;
+ QRegion shapeRegion () const Q_DECL_OVERRIDE;
//
@@ -97,7 +97,7 @@ public:
//
public:
- virtual bool contains (const QPoint &point) const;
+ bool contains (const QPoint &point) const Q_DECL_OVERRIDE;
//
@@ -105,8 +105,8 @@ public:
//
public:
- virtual void paintBorder (QImage *destPixmap, const QRect &docRect,
- bool selectionFinished) const;
+ void paintBorder (QImage *destPixmap, const QRect &docRect,
+ bool selectionFinished) const Q_DECL_OVERRIDE;
private:
diff --git a/layers/selections/image/kpFreeFormImageSelection.h b/layers/selections/image/kpFreeFormImageSelection.h
index 9d8b379..5209c40 100644
--- a/layers/selections/image/kpFreeFormImageSelection.h
+++ b/layers/selections/image/kpFreeFormImageSelection.h
@@ -54,7 +54,7 @@ public:
kpFreeFormImageSelection &operator= (const kpFreeFormImageSelection &rhs);
- virtual kpFreeFormImageSelection *clone () const;
+ kpFreeFormImageSelection *clone () const Q_DECL_OVERRIDE;
virtual ~kpFreeFormImageSelection ();
@@ -65,11 +65,11 @@ public:
public:
static const int SerialID = 2;
- virtual int serialID () const;
+ int serialID () const Q_DECL_OVERRIDE;
- virtual bool readFromStream (QDataStream &stream);
+ bool readFromStream (QDataStream &stream) Q_DECL_OVERRIDE;
- virtual void writeToStream (QDataStream &stream) const;
+ void writeToStream (QDataStream &stream) const Q_DECL_OVERRIDE;
//
@@ -77,9 +77,9 @@ public:
//
public:
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
- virtual bool isRectangular () const;
+ bool isRectangular () const Q_DECL_OVERRIDE;
// (as passed to the constructor)
QPolygon originalPoints () const;
@@ -113,7 +113,7 @@ public:
// Implements kpAbstractSelection interface - same as
// cardinallyAdjacentPointsLoop ().
// This implementation is fast.
- virtual QPolygon calculatePoints () const;
+ QPolygon calculatePoints () const Q_DECL_OVERRIDE;
//
@@ -121,7 +121,7 @@ public:
//
public:
- virtual QRegion shapeRegion () const;
+ QRegion shapeRegion () const Q_DECL_OVERRIDE;
//
@@ -129,7 +129,7 @@ public:
//
public:
- virtual bool contains (const QPoint &point) const;
+ bool contains (const QPoint &point) const Q_DECL_OVERRIDE;
//
@@ -137,9 +137,9 @@ public:
//
public:
- virtual void moveBy (int dx, int dy);
+ void moveBy (int dx, int dy) Q_DECL_OVERRIDE;
- virtual void flip (bool horiz, bool vert);
+ void flip (bool horiz, bool vert) Q_DECL_OVERRIDE;
//
@@ -147,8 +147,8 @@ public:
//
public:
- virtual void paintBorder (QImage *destPixmap, const QRect &docRect,
- bool selectionFinished) const;
+ void paintBorder (QImage *destPixmap, const QRect &docRect,
+ bool selectionFinished) const Q_DECL_OVERRIDE;
private:
diff --git a/layers/selections/image/kpRectangularImageSelection.h b/layers/selections/image/kpRectangularImageSelection.h
index 0929c98..44de10f 100644
--- a/layers/selections/image/kpRectangularImageSelection.h
+++ b/layers/selections/image/kpRectangularImageSelection.h
@@ -54,7 +54,7 @@ public:
kpRectangularImageSelection &operator= (const kpRectangularImageSelection &rhs);
- virtual kpRectangularImageSelection *clone () const;
+ kpRectangularImageSelection *clone () const Q_DECL_OVERRIDE;
virtual ~kpRectangularImageSelection ();
@@ -65,7 +65,7 @@ public:
public:
static const int SerialID = 0;
- virtual int serialID () const;
+ int serialID () const Q_DECL_OVERRIDE;
//
@@ -73,7 +73,7 @@ public:
//
public:
- virtual bool isRectangular () const;
+ bool isRectangular () const Q_DECL_OVERRIDE;
//
@@ -81,7 +81,7 @@ public:
//
public:
- virtual QPolygon calculatePoints () const;
+ QPolygon calculatePoints () const Q_DECL_OVERRIDE;
//
@@ -89,9 +89,9 @@ public:
//
public:
- virtual QBitmap shapeBitmap (bool nullForRectangular = false) const;
+ QBitmap shapeBitmap (bool nullForRectangular = false) const Q_DECL_OVERRIDE;
- virtual QRegion shapeRegion () const;
+ QRegion shapeRegion () const Q_DECL_OVERRIDE;
//
@@ -99,7 +99,7 @@ public:
//
public:
- virtual bool contains (const QPoint &point) const;
+ bool contains (const QPoint &point) const Q_DECL_OVERRIDE;
//
@@ -107,8 +107,8 @@ public:
//
public:
- virtual void paintBorder (QImage *destPixmap, const QRect &docRect,
- bool selectionFinished) const;
+ void paintBorder (QImage *destPixmap, const QRect &docRect,
+ bool selectionFinished) const Q_DECL_OVERRIDE;
private:
diff --git a/layers/selections/text/kpTextSelection.h b/layers/selections/text/kpTextSelection.h
index 8a02e4a..10380b9 100644
--- a/layers/selections/text/kpTextSelection.h
+++ b/layers/selections/text/kpTextSelection.h
@@ -104,7 +104,7 @@ public:
kpTextSelection &operator= (const kpTextSelection &rhs);
- virtual kpTextSelection *clone () const;
+ kpTextSelection *clone () const Q_DECL_OVERRIDE;
// Returns a copy of the text selection but with new dimensions
// <newWidth> x <newHeight>.
@@ -118,11 +118,11 @@ public:
//
public:
- virtual int serialID () const;
+ int serialID () const Q_DECL_OVERRIDE;
- virtual bool readFromStream (QDataStream &stream);
+ bool readFromStream (QDataStream &stream) Q_DECL_OVERRIDE;
- virtual void writeToStream (QDataStream &stream) const;
+ void writeToStream (QDataStream &stream) const Q_DECL_OVERRIDE;
//
@@ -130,12 +130,12 @@ public:
//
public:
- virtual QString name () const;
+ QString name () const Q_DECL_OVERRIDE;
- virtual kpCommandSize::SizeType size () const;
+ kpCommandSize::SizeType size () const Q_DECL_OVERRIDE;
public:
- virtual bool isRectangular () const;
+ bool isRectangular () const Q_DECL_OVERRIDE;
//
@@ -157,8 +157,8 @@ public:
//
// Otherwise, if enforcement fails, e.g. textAreaRect() will
// not work.
- virtual int minimumWidth () const;
- virtual int minimumHeight () const;
+ int minimumWidth () const Q_DECL_OVERRIDE;
+ int minimumHeight () const Q_DECL_OVERRIDE;
public:
// Returns the suggested minimum size that a textbox should be if it is of
@@ -180,7 +180,7 @@ public:
QRect textAreaRect () const;
public:
- virtual QPolygon calculatePoints () const;
+ QPolygon calculatePoints () const Q_DECL_OVERRIDE;
//
@@ -188,7 +188,7 @@ public:
//
public:
- virtual bool contains (const QPoint &point) const;
+ bool contains (const QPoint &point) const Q_DECL_OVERRIDE;
public:
bool pointIsInTextBorderArea (const QPoint &point) const;
@@ -201,9 +201,9 @@ public:
public:
// (see class header comment)
- virtual bool hasContent () const;
+ bool hasContent () const Q_DECL_OVERRIDE;
- virtual void deleteContent ();
+ void deleteContent () Q_DECL_OVERRIDE;
public:
QList <QString> textLines () const;
@@ -266,10 +266,10 @@ private:
void drawPreeditString(QPainter &painter, int &x, int y, const kpPreeditText &preeditText) const;
public:
- virtual void paint(QImage *destPixmap, const QRect &docRect) const;
+ void paint(QImage *destPixmap, const QRect &docRect) const Q_DECL_OVERRIDE;
- virtual void paintBorder(QImage *destPixmap, const QRect &docRect,
- bool selectionFinished) const;
+ void paintBorder(QImage *destPixmap, const QRect &docRect,
+ bool selectionFinished) const Q_DECL_OVERRIDE;
public:
// Returns an image that contains the painted text (without a border).
diff --git a/lgpl/generic/widgets/kpColorCellsBase.h b/lgpl/generic/widgets/kpColorCellsBase.h
index 3de46a4..a0e3ff3 100644
--- a/lgpl/generic/widgets/kpColorCellsBase.h
+++ b/lgpl/generic/widgets/kpColorCellsBase.h
@@ -154,21 +154,21 @@ protected:
/** Grays out the cells, when the object is disabled.
Added for KolourPaint.
*/
- virtual void changeEvent( QEvent* event );
+ void changeEvent( QEvent* event ) Q_DECL_OVERRIDE;
// the three methods below are used to ensure equal column widths and row heights
// for all cells and to update the widths/heights when the widget is resized
- virtual int sizeHintForColumn(int column) const;
- virtual int sizeHintForRow(int column) const;
- virtual void resizeEvent( QResizeEvent* event );
-
- virtual void mouseReleaseEvent( QMouseEvent * );
- virtual void mousePressEvent( QMouseEvent * );
- virtual void mouseMoveEvent( QMouseEvent * );
- virtual void dragEnterEvent( QDragEnterEvent * );
- virtual void dragMoveEvent( QDragMoveEvent * );
- virtual void dropEvent( QDropEvent *);
- virtual void mouseDoubleClickEvent( QMouseEvent * );
+ int sizeHintForColumn(int column) const Q_DECL_OVERRIDE;
+ int sizeHintForRow(int column) const Q_DECL_OVERRIDE;
+ void resizeEvent( QResizeEvent* event ) Q_DECL_OVERRIDE;
+
+ void mouseReleaseEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
+ void mouseMoveEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
+ void dragEnterEvent( QDragEnterEvent * ) Q_DECL_OVERRIDE;
+ void dragMoveEvent( QDragMoveEvent * ) Q_DECL_OVERRIDE;
+ void dropEvent( QDropEvent *) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
/** <allowEmptyCell> was added for KolourPaint. */
int positionToCell(const QPoint &pos, bool ignoreBorders=false,
diff --git a/mainWindow/kpMainWindow.h b/mainWindow/kpMainWindow.h
index 2c49a4c..2f59996 100644
--- a/mainWindow/kpMainWindow.h
+++ b/mainWindow/kpMainWindow.h
@@ -104,7 +104,7 @@ public:
// window without a document at all).
kpMainWindow (kpDocument *newDoc);
- virtual void finalizeGUI(KXMLGUIClient *client);
+ void finalizeGUI(KXMLGUIClient *client) Q_DECL_OVERRIDE;
private:
void readGeneralSettings ();
@@ -115,11 +115,11 @@ private:
// (only called for restoring a previous session e.g. starting KDE with
// a previously saved session; it's not called on normal KolourPaint
// startup)
- virtual void readProperties (const KConfigGroup &configGroup);
+ void readProperties (const KConfigGroup &configGroup) Q_DECL_OVERRIDE;
// (only called for saving the current session e.g. logging out of KDE
// with the KolourPaint window open; it's not called on normal KolourPaint
// exit)
- virtual void saveProperties (KConfigGroup &configGroup);
+ void saveProperties (KConfigGroup &configGroup) Q_DECL_OVERRIDE;
public:
~kpMainWindow ();
@@ -140,9 +140,9 @@ private:
void setDocument (kpDocument *newDoc);
- virtual void dragEnterEvent (QDragEnterEvent *e);
- virtual void dropEvent (QDropEvent *e);
- virtual void moveEvent (QMoveEvent *e);
+ void dragEnterEvent (QDragEnterEvent *e) Q_DECL_OVERRIDE;
+ void dropEvent (QDropEvent *e) Q_DECL_OVERRIDE;
+ void moveEvent (QMoveEvent *e) Q_DECL_OVERRIDE;
private slots:
void slotScrollViewAfterScroll ();
@@ -391,7 +391,7 @@ private slots:
void slotMail ();
bool queryCloseDocument ();
- virtual bool queryClose ();
+ bool queryClose () Q_DECL_OVERRIDE;
void slotClose ();
void slotQuit ();
diff --git a/tools/flow/kpToolBrush.h b/tools/flow/kpToolBrush.h
index aa83146..f1f2463 100644
--- a/tools/flow/kpToolBrush.h
+++ b/tools/flow/kpToolBrush.h
@@ -42,8 +42,8 @@ public:
kpToolBrush (kpToolEnvironment *environ, QObject *parent);
protected:
- virtual QString haventBegunDrawUserMessage () const;
- virtual bool haveDiverseBrushes () const { return true; }
+ QString haventBegunDrawUserMessage () const Q_DECL_OVERRIDE;
+ bool haveDiverseBrushes () const Q_DECL_OVERRIDE { return true; }
};
diff --git a/tools/flow/kpToolColorEraser.h b/tools/flow/kpToolColorEraser.h
index 4fa3e9f..d4f2e52 100644
--- a/tools/flow/kpToolColorEraser.h
+++ b/tools/flow/kpToolColorEraser.h
@@ -44,21 +44,21 @@ public:
public:
- virtual void globalDraw ();
+ void globalDraw () Q_DECL_OVERRIDE;
protected:
- virtual QString haventBegunDrawUserMessage () const;
+ QString haventBegunDrawUserMessage () const Q_DECL_OVERRIDE;
- virtual bool drawShouldProceed (const QPoint &thisPoint,
+ bool drawShouldProceed (const QPoint &thisPoint,
const QPoint &lastPoint,
- const QRect &normalizedRect);
+ const QRect &normalizedRect) Q_DECL_OVERRIDE;
- virtual bool haveSquareBrushes () const { return true; }
- virtual bool colorsAreSwapped () const { return true; }
+ bool haveSquareBrushes () const Q_DECL_OVERRIDE { return true; }
+ bool colorsAreSwapped () const Q_DECL_OVERRIDE { return true; }
- virtual QRect drawLine (const QPoint &thisPoint, const QPoint &lastPoint);
+ QRect drawLine (const QPoint &thisPoint, const QPoint &lastPoint) Q_DECL_OVERRIDE;
};
diff --git a/tools/flow/kpToolEraser.h b/tools/flow/kpToolEraser.h
index 321e3da..34f0f48 100644
--- a/tools/flow/kpToolEraser.h
+++ b/tools/flow/kpToolEraser.h
@@ -41,14 +41,14 @@ Q_OBJECT
public:
kpToolEraser (kpToolEnvironment *environ, QObject *parent);
- virtual void globalDraw ();
+ void globalDraw () Q_DECL_OVERRIDE;
protected:
- virtual QString haventBegunDrawUserMessage () const;
+ QString haventBegunDrawUserMessage () const Q_DECL_OVERRIDE;
- virtual bool haveSquareBrushes () const { return true; }
- virtual bool colorsAreSwapped () const { return true; }
+ bool haveSquareBrushes () const Q_DECL_OVERRIDE { return true; }
+ bool colorsAreSwapped () const Q_DECL_OVERRIDE { return true; }
};
diff --git a/tools/flow/kpToolFlowBase.h b/tools/flow/kpToolFlowBase.h
index e867ec5..5db97c3 100644
--- a/tools/flow/kpToolFlowBase.h
+++ b/tools/flow/kpToolFlowBase.h
@@ -62,11 +62,11 @@ class kpToolFlowBase : public kpTool
const QPoint &mousePoint,
int brushWidth, int brushHeight);
- virtual void begin();
- virtual void end();
+ void begin() Q_DECL_OVERRIDE;
+ void end() Q_DECL_OVERRIDE;
- virtual void beginDraw();
- virtual void hover(const QPoint &point);
+ void beginDraw() Q_DECL_OVERRIDE;
+ void hover(const QPoint &point) Q_DECL_OVERRIDE;
// drawPoint() normally calls drawLine(point,point). Override drawPoint()
// if you think you can be more efficient.
@@ -74,10 +74,10 @@ class kpToolFlowBase : public kpTool
virtual QRect drawLine(const QPoint &thisPoint, const QPoint &lastPoint) = 0;
virtual bool drawShouldProceed(const QPoint & /*thisPoint*/, const QPoint & /*lastPoint*/, const QRect & /*normalizedRect*/) { return true; }
- virtual void draw(const QPoint &thisPoint, const QPoint &lastPoint, const QRect &normalizedRect);
- virtual void cancelShape();
- virtual void releasedAllButtons();
- virtual void endDraw(const QPoint &, const QRect &);
+ void draw(const QPoint &thisPoint, const QPoint &lastPoint, const QRect &normalizedRect) Q_DECL_OVERRIDE;
+ void cancelShape() Q_DECL_OVERRIDE;
+ void releasedAllButtons() Q_DECL_OVERRIDE;
+ void endDraw(const QPoint &, const QRect &) Q_DECL_OVERRIDE;
protected:
virtual QString haventBegunDrawUserMessage() const = 0;
@@ -106,8 +106,8 @@ class kpToolFlowBase : public kpTool
protected slots:
void updateBrushAndCursor();
- virtual void slotForegroundColorChanged(const kpColor &col);
- virtual void slotBackgroundColorChanged(const kpColor &col);
+ void slotForegroundColorChanged(const kpColor &col) Q_DECL_OVERRIDE;
+ void slotBackgroundColorChanged(const kpColor &col) Q_DECL_OVERRIDE;
private:
void clearBrushCursorData();
diff --git a/tools/flow/kpToolFlowPixmapBase.h b/tools/flow/kpToolFlowPixmapBase.h
index e1f5ef0..f49eeb4 100644
--- a/tools/flow/kpToolFlowPixmapBase.h
+++ b/tools/flow/kpToolFlowPixmapBase.h
@@ -51,7 +51,7 @@ public:
kpToolEnvironment *environ, QObject *parent, const QString &name);
protected:
- virtual QRect drawLine (const QPoint &thisPoint, const QPoint &lastPoint);
+ QRect drawLine (const QPoint &thisPoint, const QPoint &lastPoint) Q_DECL_OVERRIDE;
};
diff --git a/tools/flow/kpToolPen.h b/tools/flow/kpToolPen.h
index 84640a1..ba5f0eb 100644
--- a/tools/flow/kpToolPen.h
+++ b/tools/flow/kpToolPen.h
@@ -42,8 +42,8 @@ public:
kpToolPen (kpToolEnvironment *environ, QObject *parent);
protected:
- virtual QString haventBegunDrawUserMessage () const;
- virtual QRect drawLine (const QPoint &thisPoint, const QPoint &lastPoint);
+ QString haventBegunDrawUserMessage () const Q_DECL_OVERRIDE;
+ QRect drawLine (const QPoint &thisPoint, const QPoint &lastPoint) Q_DECL_OVERRIDE;
};
diff --git a/tools/flow/kpToolSpraycan.h b/tools/flow/kpToolSpraycan.h
index 6227972..7cef061 100644
--- a/tools/flow/kpToolSpraycan.h
+++ b/tools/flow/kpToolSpraycan.h
@@ -49,27 +49,27 @@ public:
kpToolSpraycan (kpToolEnvironment *environ, QObject *parent);
protected:
- virtual QString haventBegunDrawUserMessage () const;
+ QString haventBegunDrawUserMessage () const Q_DECL_OVERRIDE;
public:
- virtual void begin ();
- virtual void end ();
+ void begin () Q_DECL_OVERRIDE;
+ void end () Q_DECL_OVERRIDE;
public:
- virtual void beginDraw ();
+ void beginDraw () Q_DECL_OVERRIDE;
protected:
// (ASSUMPTION: <probability> is between 0.0 and 1.0 inclusive)
QRect drawLineWithProbability (const QPoint &thisPoint,
const QPoint &lastPoint,
double probability);
public:
- virtual QRect drawPoint (const QPoint &point);
- virtual QRect drawLine (const QPoint &thisPoint, const QPoint &lastPoint);
- virtual void cancelShape ();
- virtual void endDraw (const QPoint &thisPoint,
- const QRect &normalizedRect);
+ QRect drawPoint (const QPoint &point) Q_DECL_OVERRIDE;
+ QRect drawLine (const QPoint &thisPoint, const QPoint &lastPoint) Q_DECL_OVERRIDE;
+ void cancelShape () Q_DECL_OVERRIDE;
+ void endDraw (const QPoint &thisPoint,
+ const QRect &normalizedRect) Q_DECL_OVERRIDE;
protected slots:
void timeoutDraw ();
diff --git a/tools/kpToolColorPicker.h b/tools/kpToolColorPicker.h
index 0d417e2..3288e93 100644
--- a/tools/kpToolColorPicker.h
+++ b/tools/kpToolColorPicker.h
@@ -48,7 +48,7 @@ public:
// generally the user goes to pick a color but wants to return to using
// his/her previous drawing tool
- virtual bool returnToPreviousToolAfterEndDraw () const { return true; }
+ bool returnToPreviousToolAfterEndDraw () const Q_DECL_OVERRIDE { return true; }
private:
kpColor colorAtPixel (const QPoint &p);
@@ -56,12 +56,12 @@ private:
QString haventBegunDrawUserMessage () const;
public:
- virtual void begin ();
- virtual void beginDraw ();
- virtual void draw (const QPoint &thisPoint, const QPoint &, const QRect &);
- virtual void cancelShape ();
- virtual void releasedAllButtons ();
- virtual void endDraw (const QPoint &thisPoint, const QRect &);
+ void begin () Q_DECL_OVERRIDE;
+ void beginDraw () Q_DECL_OVERRIDE;
+ void draw (const QPoint &thisPoint, const QPoint &, const QRect &) Q_DECL_OVERRIDE;
+ void cancelShape () Q_DECL_OVERRIDE;
+ void releasedAllButtons () Q_DECL_OVERRIDE;
+ void endDraw (const QPoint &thisPoint, const QRect &) Q_DECL_OVERRIDE;
private:
kpColor m_oldColor;
diff --git a/tools/kpToolFloodFill.h b/tools/kpToolFloodFill.h
index 1f30047..1cd2444 100644
--- a/tools/kpToolFloodFill.h
+++ b/tools/kpToolFloodFill.h
@@ -45,12 +45,12 @@ private:
QString haventBegunDrawUserMessage () const;
public:
- virtual void begin ();
- virtual void beginDraw ();
- virtual void draw (const QPoint &thisPoint, const QPoint &, const QRect &);
- virtual void cancelShape ();
- virtual void releasedAllButtons ();
- virtual void endDraw (const QPoint &, const QRect &);
+ void begin () Q_DECL_OVERRIDE;
+ void beginDraw () Q_DECL_OVERRIDE;
+ void draw (const QPoint &thisPoint, const QPoint &, const QRect &) Q_DECL_OVERRIDE;
+ void cancelShape () Q_DECL_OVERRIDE;
+ void releasedAllButtons () Q_DECL_OVERRIDE;
+ void endDraw (const QPoint &, const QRect &) Q_DECL_OVERRIDE;
private:
struct kpToolFloodFillPrivate * const d;
diff --git a/tools/kpToolZoom.h b/tools/kpToolZoom.h
index 2f9e994..5566ce5 100644
--- a/tools/kpToolZoom.h
+++ b/tools/kpToolZoom.h
@@ -41,22 +41,22 @@ public:
kpToolZoom (kpToolEnvironment *environ, QWidget *parent);
virtual ~kpToolZoom ();
- virtual bool returnToPreviousToolAfterEndDraw () const;
+ bool returnToPreviousToolAfterEndDraw () const Q_DECL_OVERRIDE;
private:
QString haventBegunDrawUserMessage () const;
public:
- virtual void begin ();
- virtual void end ();
+ void begin () Q_DECL_OVERRIDE;
+ void end () Q_DECL_OVERRIDE;
- virtual void globalDraw ();
+ void globalDraw () Q_DECL_OVERRIDE;
- virtual void beginDraw ();
- virtual void draw (const QPoint &thisPoint, const QPoint &, const QRect &);
- virtual void cancelShape ();
- virtual void releasedAllButtons ();
- virtual void endDraw (const QPoint &thisPoint, const QRect &);
+ void beginDraw () Q_DECL_OVERRIDE;
+ void draw (const QPoint &thisPoint, const QPoint &, const QRect &) Q_DECL_OVERRIDE;
+ void cancelShape () Q_DECL_OVERRIDE;
+ void releasedAllButtons () Q_DECL_OVERRIDE;
+ void endDraw (const QPoint &thisPoint, const QRect &) Q_DECL_OVERRIDE;
private:
struct kpToolZoomPrivate *d;
diff --git a/tools/polygonal/kpToolCurve.h b/tools/polygonal/kpToolCurve.h
index e8d198a..a5f09f2 100644
--- a/tools/polygonal/kpToolCurve.h
+++ b/tools/polygonal/kpToolCurve.h
@@ -42,12 +42,12 @@ public:
virtual ~kpToolCurve ();
protected:
- virtual QString haventBegunShapeUserMessage () const;
+ QString haventBegunShapeUserMessage () const Q_DECL_OVERRIDE;
- virtual bool drawingALine () const;
+ bool drawingALine () const Q_DECL_OVERRIDE;
public:
- virtual void endDraw (const QPoint &, const QRect &);
+ void endDraw (const QPoint &, const QRect &) Q_DECL_OVERRIDE;
};
diff --git a/tools/polygonal/kpToolLine.h b/tools/polygonal/kpToolLine.h
index 4d14e07..41c12a4 100644
--- a/tools/polygonal/kpToolLine.h
+++ b/tools/polygonal/kpToolLine.h
@@ -41,10 +41,10 @@ public:
kpToolLine (kpToolEnvironment *environ, QObject *parent);
private:
- virtual QString haventBegunShapeUserMessage () const;
+ QString haventBegunShapeUserMessage () const Q_DECL_OVERRIDE;
public:
- virtual void endDraw (const QPoint &, const QRect &);
+ void endDraw (const QPoint &, const QRect &) Q_DECL_OVERRIDE;
};
diff --git a/tools/polygonal/kpToolPolygon.h b/tools/polygonal/kpToolPolygon.h
index 6e7f186..ea93f93 100644
--- a/tools/polygonal/kpToolPolygon.h
+++ b/tools/polygonal/kpToolPolygon.h
@@ -42,17 +42,17 @@ public:
virtual ~kpToolPolygon ();
private:
- virtual QString haventBegunShapeUserMessage () const;
+ QString haventBegunShapeUserMessage () const Q_DECL_OVERRIDE;
public:
- virtual void begin ();
- virtual void end ();
+ void begin () Q_DECL_OVERRIDE;
+ void end () Q_DECL_OVERRIDE;
protected:
- virtual kpColor drawingBackgroundColor () const;
+ kpColor drawingBackgroundColor () const Q_DECL_OVERRIDE;
public:
- virtual void endDraw (const QPoint &, const QRect &);
+ void endDraw (const QPoint &, const QRect &) Q_DECL_OVERRIDE;
private:
struct kpToolPolygonPrivate *d;
diff --git a/tools/polygonal/kpToolPolygonalBase.h b/tools/polygonal/kpToolPolygonalBase.h
index 9102389..e6e575f 100644
--- a/tools/polygonal/kpToolPolygonalBase.h
+++ b/tools/polygonal/kpToolPolygonalBase.h
@@ -101,7 +101,7 @@ public:
const QString &name);
virtual ~kpToolPolygonalBase ();
- virtual bool careAboutModifierState () const { return true; }
+ bool careAboutModifierState () const Q_DECL_OVERRIDE { return true; }
protected:
// The maximum number of points() we should allow (mainly, to ensure
@@ -111,10 +111,10 @@ protected:
virtual QString haventBegunShapeUserMessage () const = 0;
public:
- virtual void begin ();
- virtual void end ();
+ void begin () Q_DECL_OVERRIDE;
+ void end () Q_DECL_OVERRIDE;
- virtual void beginDraw ();
+ void beginDraw () Q_DECL_OVERRIDE;
protected:
// Adjusts the current line (end points given by the last 2 points of points())
@@ -170,7 +170,7 @@ protected:
// returns 2 points.
virtual bool drawingALine () const { return true; }
public:
- virtual void draw (const QPoint &, const QPoint &, const QRect &);
+ void draw (const QPoint &, const QPoint &, const QRect &) Q_DECL_OVERRIDE;
private:
kpColor drawingForegroundColor () const;
protected:
@@ -183,15 +183,15 @@ protected:
protected slots:
void updateShape ();
public:
- virtual void cancelShape ();
- virtual void releasedAllButtons ();
- virtual void endShape (const QPoint & = QPoint (), const QRect & = QRect ());
+ void cancelShape () Q_DECL_OVERRIDE;
+ void releasedAllButtons () Q_DECL_OVERRIDE;
+ void endShape (const QPoint & = QPoint (), const QRect & = QRect ()) Q_DECL_OVERRIDE;
- virtual bool hasBegunShape () const;
+ bool hasBegunShape () const Q_DECL_OVERRIDE;
protected slots:
- virtual void slotForegroundColorChanged (const kpColor &);
- virtual void slotBackgroundColorChanged (const kpColor &);
+ void slotForegroundColorChanged (const kpColor &) Q_DECL_OVERRIDE;
+ void slotBackgroundColorChanged (const kpColor &) Q_DECL_OVERRIDE;
private:
kpToolPolygonalBasePrivate * const d;
diff --git a/tools/polygonal/kpToolPolyline.h b/tools/polygonal/kpToolPolyline.h
index 8664827..cab77e3 100644
--- a/tools/polygonal/kpToolPolyline.h
+++ b/tools/polygonal/kpToolPolyline.h
@@ -41,7 +41,7 @@ public:
kpToolPolyline (kpToolEnvironment *environ, QObject *parent);
private:
- virtual QString haventBegunShapeUserMessage () const;
+ QString haventBegunShapeUserMessage () const Q_DECL_OVERRIDE;
public:
// (used by kpToolLine)
@@ -51,7 +51,7 @@ public:
const kpColor &bcolor,
bool isFinal);
- virtual void endDraw (const QPoint &, const QRect &);
+ void endDraw (const QPoint &, const QRect &) Q_DECL_OVERRIDE;
};
diff --git a/tools/rectangular/kpToolRectangularBase.h b/tools/rectangular/kpToolRectangularBase.h
index 48b9a4d..f856767 100644
--- a/tools/rectangular/kpToolRectangularBase.h
+++ b/tools/rectangular/kpToolRectangularBase.h
@@ -65,7 +65,7 @@ public:
virtual ~kpToolRectangularBase ();
- virtual bool careAboutModifierState () const { return true; }
+ bool careAboutModifierState () const Q_DECL_OVERRIDE { return true; }
private slots:
virtual void slotLineWidthChanged ();
@@ -75,21 +75,21 @@ private:
QString haventBegunDrawUserMessage () const;
public:
- virtual void begin ();
- virtual void end ();
+ void begin () Q_DECL_OVERRIDE;
+ void end () Q_DECL_OVERRIDE;
private:
void applyModifiers ();
- virtual void beginDraw ();
+ void beginDraw () Q_DECL_OVERRIDE;
private:
kpColor drawingForegroundColor () const;
kpColor drawingBackgroundColor () const;
void updateShape ();
public:
- virtual void draw (const QPoint &, const QPoint &, const QRect &);
- virtual void cancelShape ();
- virtual void releasedAllButtons ();
- virtual void endDraw (const QPoint &, const QRect &);
+ void draw (const QPoint &, const QPoint &, const QRect &) Q_DECL_OVERRIDE;
+ void cancelShape () Q_DECL_OVERRIDE;
+ void releasedAllButtons () Q_DECL_OVERRIDE;
+ void endDraw (const QPoint &, const QRect &) Q_DECL_OVERRIDE;
private:
kpToolRectangularBasePrivate * const d;
diff --git a/tools/selection/image/kpAbstractImageSelectionTool.h b/tools/selection/image/kpAbstractImageSelectionTool.h
index 50cb847..2c64a3f 100644
--- a/tools/selection/image/kpAbstractImageSelectionTool.h
+++ b/tools/selection/image/kpAbstractImageSelectionTool.h
@@ -61,9 +61,9 @@ public:
//
protected:
- virtual kpAbstractSelectionContentCommand *newGiveContentCommand () const;
+ kpAbstractSelectionContentCommand *newGiveContentCommand () const Q_DECL_OVERRIDE;
- virtual QString nameOfCreateCommand () const;
+ QString nameOfCreateCommand () const Q_DECL_OVERRIDE;
//
@@ -71,9 +71,9 @@ protected:
//
protected:
- virtual QString haventBegunDrawUserMessageCreate () const;
- virtual QString haventBegunDrawUserMessageMove () const;
- virtual QString haventBegunDrawUserMessageResizeScale () const;
+ QString haventBegunDrawUserMessageCreate () const Q_DECL_OVERRIDE;
+ QString haventBegunDrawUserMessageMove () const Q_DECL_OVERRIDE;
+ QString haventBegunDrawUserMessageResizeScale () const Q_DECL_OVERRIDE;
//
@@ -97,9 +97,9 @@ protected:
const kpImageSelectionTransparency &oldTrans);
protected slots:
- virtual void slotIsOpaqueChanged (bool isOpaque);
- virtual void slotBackgroundColorChanged (const kpColor &color);
- virtual void slotColorSimilarityChanged (double similarity, int);
+ void slotIsOpaqueChanged (bool isOpaque) Q_DECL_OVERRIDE;
+ void slotBackgroundColorChanged (const kpColor &color) Q_DECL_OVERRIDE;
+ void slotColorSimilarityChanged (double similarity, int) Q_DECL_OVERRIDE;
};
diff --git a/tools/selection/image/kpToolEllipticalSelection.h b/tools/selection/image/kpToolEllipticalSelection.h
index 5cdba75..919ecf4 100644
--- a/tools/selection/image/kpToolEllipticalSelection.h
+++ b/tools/selection/image/kpToolEllipticalSelection.h
@@ -40,10 +40,10 @@ public:
virtual ~kpToolEllipticalSelection ();
protected:
- virtual bool drawCreateMoreSelectionAndUpdateStatusBar (
+ bool drawCreateMoreSelectionAndUpdateStatusBar (
bool dragAccepted,
const QPoint &accidentalDragAdjustedPoint,
- const QRect &normalizedRect);
+ const QRect &normalizedRect) Q_DECL_OVERRIDE;
};
diff --git a/tools/selection/image/kpToolFreeFormSelection.h b/tools/selection/image/kpToolFreeFormSelection.h
index 40f9f02..8e15da0 100644
--- a/tools/selection/image/kpToolFreeFormSelection.h
+++ b/tools/selection/image/kpToolFreeFormSelection.h
@@ -40,10 +40,10 @@ public:
virtual ~kpToolFreeFormSelection ();
protected:
- virtual bool drawCreateMoreSelectionAndUpdateStatusBar (
+ bool drawCreateMoreSelectionAndUpdateStatusBar (
bool dragAccepted,
const QPoint &accidentalDragAdjustedPoint,
- const QRect &normalizedRect);
+ const QRect &normalizedRect) Q_DECL_OVERRIDE;
};
diff --git a/tools/selection/image/kpToolRectSelection.h b/tools/selection/image/kpToolRectSelection.h
index 60c697c..32e31bf 100644
--- a/tools/selection/image/kpToolRectSelection.h
+++ b/tools/selection/image/kpToolRectSelection.h
@@ -40,10 +40,10 @@ public:
virtual ~kpToolRectSelection ();
protected:
- virtual bool drawCreateMoreSelectionAndUpdateStatusBar (
+ bool drawCreateMoreSelectionAndUpdateStatusBar (
bool dragAccepted,
const QPoint &accidentalDragAdjustedPoint,
- const QRect &normalizedRect);
+ const QRect &normalizedRect) Q_DECL_OVERRIDE;
};
diff --git a/tools/selection/kpAbstractSelectionTool.h b/tools/selection/kpAbstractSelectionTool.h
index 8513c47..0375e6f 100644
--- a/tools/selection/kpAbstractSelectionTool.h
+++ b/tools/selection/kpAbstractSelectionTool.h
@@ -124,7 +124,7 @@ public:
// Inform kpTool to call draw() when CTRL, SHIFT and friends are
// pressed. CTRL is used for copying, instead of moving, the
// selection. SHIFT is used for sweeping.
- virtual bool careAboutModifierState () const { return true; }
+ bool careAboutModifierState () const Q_DECL_OVERRIDE { return true; }
//
@@ -245,12 +245,12 @@ private:
public:
- virtual void begin ();
- virtual void end ();
+ void begin () Q_DECL_OVERRIDE;
+ void end () Q_DECL_OVERRIDE;
public:
- virtual void reselect ();
+ void reselect () Q_DECL_OVERRIDE;
//
@@ -289,7 +289,7 @@ protected:
// returning "None" instead of calling the base implementation.
virtual DrawType calculateDrawType () const;
public:
- virtual void beginDraw ();
+ void beginDraw () Q_DECL_OVERRIDE;
//
@@ -297,9 +297,9 @@ public:
//
public:
- virtual void hover (const QPoint &point);
- virtual void draw (const QPoint &thisPoint, const QPoint &lastPoint,
- const QRect &normalizedRect);
+ void hover (const QPoint &point) Q_DECL_OVERRIDE;
+ void draw (const QPoint &thisPoint, const QPoint &lastPoint,
+ const QRect &normalizedRect) Q_DECL_OVERRIDE;
//
@@ -307,8 +307,8 @@ public:
//
public:
- virtual void cancelShape ();
- virtual void releasedAllButtons ();
+ void cancelShape () Q_DECL_OVERRIDE;
+ void releasedAllButtons () Q_DECL_OVERRIDE;
protected:
@@ -323,7 +323,7 @@ protected:
// code in your handler after the call.
void popupRMBMenu ();
public:
- virtual void endDraw (const QPoint &thisPoint, const QRect &normalizedRect);
+ void endDraw (const QPoint &thisPoint, const QRect &normalizedRect) Q_DECL_OVERRIDE;
//
@@ -589,7 +589,7 @@ protected slots:
protected:
// Reimplemented to trap Esc presses for deselecting the selection.
// All other keypresses are passed to the base implementation.
- virtual void keyPressEvent (QKeyEvent *e);
+ void keyPressEvent (QKeyEvent *e) Q_DECL_OVERRIDE;
private:
diff --git a/tools/selection/text/kpToolText.h b/tools/selection/text/kpToolText.h
index f7e49eb..ebbb01e 100644
--- a/tools/selection/text/kpToolText.h
+++ b/tools/selection/text/kpToolText.h
@@ -138,23 +138,23 @@ private:
//
protected:
- virtual kpAbstractSelectionContentCommand *newGiveContentCommand () const;
+ kpAbstractSelectionContentCommand *newGiveContentCommand () const Q_DECL_OVERRIDE;
- virtual QString nameOfCreateCommand () const;
+ QString nameOfCreateCommand () const Q_DECL_OVERRIDE;
protected:
- virtual void setSelectionBorderForHaventBegunDraw ();
+ void setSelectionBorderForHaventBegunDraw () Q_DECL_OVERRIDE;
public:
- virtual void begin ();
- virtual void end ();
+ void begin () Q_DECL_OVERRIDE;
+ void end () Q_DECL_OVERRIDE;
public:
bool hasBegunText () const;
- virtual bool hasBegunShape () const;
+ bool hasBegunShape () const Q_DECL_OVERRIDE;
//
@@ -162,15 +162,15 @@ public:
//
protected:
- virtual DrawType calculateDrawTypeInsideSelection () const;
+ DrawType calculateDrawTypeInsideSelection () const Q_DECL_OVERRIDE;
public:
- virtual void cancelShape ();
+ void cancelShape () Q_DECL_OVERRIDE;
public:
- virtual void endShape (const QPoint &thisPoint, const QRect &normalizedRect);
+ void endShape (const QPoint &thisPoint, const QRect &normalizedRect) Q_DECL_OVERRIDE;
//
@@ -178,8 +178,8 @@ public:
//
protected:
- virtual QVariant operation (DrawType drawType, Operation op,
- const QVariant &data1 = QVariant (), const QVariant &data2 = QVariant ());
+ QVariant operation (DrawType drawType, Operation op,
+ const QVariant &data1 = QVariant (), const QVariant &data2 = QVariant ()) Q_DECL_OVERRIDE;
//
@@ -187,11 +187,11 @@ protected:
//
protected:
- virtual QString haventBegunDrawUserMessageCreate () const;
+ QString haventBegunDrawUserMessageCreate () const Q_DECL_OVERRIDE;
protected:
- virtual void setSelectionBorderForBeginDrawCreate ();
+ void setSelectionBorderForBeginDrawCreate () Q_DECL_OVERRIDE;
private:
@@ -214,10 +214,10 @@ private:
int *minimumWidthOut, int *minimumHeightOut,
bool *newDragHasBegun);
protected:
- virtual bool drawCreateMoreSelectionAndUpdateStatusBar (
+ bool drawCreateMoreSelectionAndUpdateStatusBar (
bool drawAcceptedAsDrag,
const QPoint &accidentalDragAdjustedPoint,
- const QRect &normalizedRectIn);
+ const QRect &normalizedRectIn) Q_DECL_OVERRIDE;
//
@@ -225,15 +225,15 @@ protected:
//
protected:
- virtual QString haventBegunDrawUserMessageMove () const;
+ QString haventBegunDrawUserMessageMove () const Q_DECL_OVERRIDE;
protected:
- virtual void setSelectionBorderForBeginDrawMove ();
+ void setSelectionBorderForBeginDrawMove () Q_DECL_OVERRIDE;
protected:
- virtual QString nonSmearMoveCommandName () const;
+ QString nonSmearMoveCommandName () const Q_DECL_OVERRIDE;
//
@@ -241,11 +241,11 @@ protected:
//
protected:
- virtual QString haventBegunDrawUserMessageResizeScale () const;
+ QString haventBegunDrawUserMessageResizeScale () const Q_DECL_OVERRIDE;
protected:
- virtual void setSelectionBorderForBeginDrawResizeScale ();
+ void setSelectionBorderForBeginDrawResizeScale () Q_DECL_OVERRIDE;
//
@@ -295,7 +295,7 @@ protected:
const kpTextStyle &oldTextStyle);
protected slots:
- virtual void slotIsOpaqueChanged (bool isOpaque);
+ void slotIsOpaqueChanged (bool isOpaque) Q_DECL_OVERRIDE;
protected:
@@ -305,15 +305,15 @@ protected:
*
* Re-implemented from kpTool.
*/
- virtual bool careAboutColorsSwapped () const { return true; }
+ bool careAboutColorsSwapped () const Q_DECL_OVERRIDE { return true; }
protected slots:
- virtual void slotColorsSwapped (const kpColor &newForegroundColor,
- const kpColor &newBackgroundColor);
+ void slotColorsSwapped (const kpColor &newForegroundColor,
+ const kpColor &newBackgroundColor) Q_DECL_OVERRIDE;
- virtual void slotForegroundColorChanged (const kpColor &color);
- virtual void slotBackgroundColorChanged (const kpColor &color);
- virtual void slotColorSimilarityChanged (double, int);
+ void slotForegroundColorChanged (const kpColor &color) Q_DECL_OVERRIDE;
+ void slotBackgroundColorChanged (const kpColor &color) Q_DECL_OVERRIDE;
+ void slotColorSimilarityChanged (double, int) Q_DECL_OVERRIDE;
public slots:
void slotFontFamilyChanged (const QString &fontFamily, const QString &oldFontFamily);
@@ -686,7 +686,7 @@ protected:
// keystrokes while a text selection is active. This is important
// because the Tool Box actions default to single letter/number
// shortcuts.
- virtual bool viewEvent (QEvent *e);
+ bool viewEvent (QEvent *e) Q_DECL_OVERRIDE;
/**
* Handles key press events.
@@ -706,7 +706,7 @@ protected:
* Re-implemented from kpAbstractSelectionTool.
*/
- virtual void keyPressEvent (QKeyEvent *e);
+ void keyPressEvent (QKeyEvent *e) Q_DECL_OVERRIDE;
//
@@ -714,7 +714,7 @@ protected:
//
protected:
- virtual void inputMethodEvent (QInputMethodEvent *e);
+ void inputMethodEvent (QInputMethodEvent *e) Q_DECL_OVERRIDE;
private:
diff --git a/views/kpThumbnailView.h b/views/kpThumbnailView.h
index 5281154..a597c28 100644
--- a/views/kpThumbnailView.h
+++ b/views/kpThumbnailView.h
@@ -83,7 +83,7 @@ protected:
*
* Extends @ref kpView.
*/
- virtual void resizeEvent (QResizeEvent *e);
+ void resizeEvent (QResizeEvent *e) Q_DECL_OVERRIDE;
};
diff --git a/views/kpUnzoomedThumbnailView.h b/views/kpUnzoomedThumbnailView.h
index 09df269..f6cb0a9 100644
--- a/views/kpUnzoomedThumbnailView.h
+++ b/views/kpUnzoomedThumbnailView.h
@@ -76,7 +76,7 @@ public:
/**
* Implements @ref kpThumbnailView.
*/
- QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
public slots:
@@ -95,7 +95,7 @@ public slots:
*
* Implements @ref kpView.
*/
- virtual void adjustToEnvironment ();
+ void adjustToEnvironment () Q_DECL_OVERRIDE;
private:
diff --git a/views/kpView.h b/views/kpView.h
index 0d24128..a637870 100644
--- a/views/kpView.h
+++ b/views/kpView.h
@@ -396,7 +396,7 @@ public:
*/
void updateQueuedArea ();
- QVariant inputMethodQuery (Qt::InputMethodQuery query) const;
+ QVariant inputMethodQuery (Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
public slots:
/**
@@ -500,43 +500,43 @@ public:
//
protected:
- virtual void mouseMoveEvent (QMouseEvent *e);
- virtual void mousePressEvent (QMouseEvent *e);
- virtual void mouseReleaseEvent (QMouseEvent *e);
+ void mouseMoveEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
+ void mousePressEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
public:
// (needs to be public as it may also get event from
// QScrollView::contentsWheelEvent())
- virtual void wheelEvent (QWheelEvent *e);
+ void wheelEvent (QWheelEvent *e) Q_DECL_OVERRIDE;
protected:
- virtual void keyPressEvent (QKeyEvent *e);
- virtual void keyReleaseEvent (QKeyEvent *e);
+ void keyPressEvent (QKeyEvent *e) Q_DECL_OVERRIDE;
+ void keyReleaseEvent (QKeyEvent *e) Q_DECL_OVERRIDE;
protected:
- virtual void inputMethodEvent (QInputMethodEvent *e);
+ void inputMethodEvent (QInputMethodEvent *e) Q_DECL_OVERRIDE;
protected:
- virtual bool event (QEvent *e);
+ bool event (QEvent *e) Q_DECL_OVERRIDE;
protected:
- virtual void focusInEvent (QFocusEvent *e);
- virtual void focusOutEvent (QFocusEvent *e);
+ void focusInEvent (QFocusEvent *e) Q_DECL_OVERRIDE;
+ void focusOutEvent (QFocusEvent *e) Q_DECL_OVERRIDE;
protected:
- virtual void enterEvent (QEvent *e);
- virtual void leaveEvent (QEvent *e);
+ void enterEvent (QEvent *e) Q_DECL_OVERRIDE;
+ void leaveEvent (QEvent *e) Q_DECL_OVERRIDE;
protected:
- virtual void dragEnterEvent (QDragEnterEvent *);
- virtual void dragLeaveEvent (QDragLeaveEvent *);
+ void dragEnterEvent (QDragEnterEvent *) Q_DECL_OVERRIDE;
+ void dragLeaveEvent (QDragLeaveEvent *) Q_DECL_OVERRIDE;
protected:
- virtual void resizeEvent (QResizeEvent *e);
+ void resizeEvent (QResizeEvent *e) Q_DECL_OVERRIDE;
//
@@ -588,7 +588,7 @@ protected:
void paintEventDrawGridLines (QPainter *painter, const QRect &viewRect);
void paintEventDrawDoc_Unclipped (const QRect &viewRect);
- virtual void paintEvent (QPaintEvent *e);
+ void paintEvent (QPaintEvent *e) Q_DECL_OVERRIDE;
private:
diff --git a/views/kpZoomedThumbnailView.h b/views/kpZoomedThumbnailView.h
index 8f41806..584c33f 100644
--- a/views/kpZoomedThumbnailView.h
+++ b/views/kpZoomedThumbnailView.h
@@ -71,7 +71,7 @@ public:
/**
* Implements @ref kpThumbnailView.
*/
- QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
public slots:
@@ -84,7 +84,7 @@ public slots:
*
* Implements @ref kpView.
*/
- virtual void adjustToEnvironment ();
+ void adjustToEnvironment () Q_DECL_OVERRIDE;
private:
diff --git a/views/kpZoomedView.h b/views/kpZoomedView.h
index cce8bb0..e17ec85 100644
--- a/views/kpZoomedView.h
+++ b/views/kpZoomedView.h
@@ -72,7 +72,7 @@ public:
/**
* Extends @kpView. Calls adjustToEnvironment().
*/
- virtual void setZoomLevel (int hzoom, int vzoom);
+ void setZoomLevel (int hzoom, int vzoom) Q_DECL_OVERRIDE;
public slots:
@@ -85,7 +85,7 @@ public slots:
*
* Implements @ref kpView.
*/
- virtual void adjustToEnvironment ();
+ void adjustToEnvironment () Q_DECL_OVERRIDE;
private:
diff --git a/widgets/colorSimilarity/kpColorSimilarityFrame.h b/widgets/colorSimilarity/kpColorSimilarityFrame.h
index 1e766d2..0b89885 100644
--- a/widgets/colorSimilarity/kpColorSimilarityFrame.h
+++ b/widgets/colorSimilarity/kpColorSimilarityFrame.h
@@ -39,12 +39,12 @@ class kpColorSimilarityFrame : public QWidget, public kpColorSimilarityHolder
public:
kpColorSimilarityFrame(QWidget *parent);
- virtual void setColorSimilarity (double similarity);
+ void setColorSimilarity (double similarity) Q_DECL_OVERRIDE;
- virtual QSize sizeHint () const;
+ QSize sizeHint () const Q_DECL_OVERRIDE;
protected:
- virtual void paintEvent (QPaintEvent *e);
+ void paintEvent (QPaintEvent *e) Q_DECL_OVERRIDE;
};
diff --git a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
index 5172975..dc50c8f 100644
--- a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
+++ b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
@@ -56,7 +56,7 @@ private:
// setting.
void setColorSimilarityInternal (double similarity, bool writeConfig);
public:
- virtual void setColorSimilarity (double similarity);
+ void setColorSimilarity (double similarity) Q_DECL_OVERRIDE;
signals:
void colorSimilarityChanged (double similarity, int processedSimilarity);
@@ -90,7 +90,7 @@ private:
void updateToolTip ();
void updateIcon ();
- virtual void resizeEvent (QResizeEvent *e);
+ void resizeEvent (QResizeEvent *e) Q_DECL_OVERRIDE;
private:
diff --git a/widgets/imagelib/effects/kpEffectBalanceWidget.h b/widgets/imagelib/effects/kpEffectBalanceWidget.h
index d961bbf..20d1b54 100644
--- a/widgets/imagelib/effects/kpEffectBalanceWidget.h
+++ b/widgets/imagelib/effects/kpEffectBalanceWidget.h
@@ -49,13 +49,13 @@ public:
kpEffectBalanceWidget (bool actOnSelection, QWidget *parent);
virtual ~kpEffectBalanceWidget ();
- virtual QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
- virtual bool isNoOp () const;
- virtual kpImage applyEffect (const kpImage &image);
+ bool isNoOp () const Q_DECL_OVERRIDE;
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
- virtual kpEffectCommandBase *createCommand (
- kpCommandEnvironment *cmdEnviron) const;
+ kpEffectCommandBase *createCommand (
+ kpCommandEnvironment *cmdEnviron) const Q_DECL_OVERRIDE;
protected:
int channels () const;
diff --git a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
index 8c420e3..21a2680 100644
--- a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
+++ b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
@@ -49,13 +49,13 @@ public:
kpEffectBlurSharpenWidget (bool actOnSelection, QWidget *parent);
virtual ~kpEffectBlurSharpenWidget ();
- virtual QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
- virtual bool isNoOp () const;
- virtual kpImage applyEffect (const kpImage &image);
+ bool isNoOp () const Q_DECL_OVERRIDE;
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
- virtual kpEffectCommandBase *createCommand (
- kpCommandEnvironment *cmdEnviron) const;
+ kpEffectCommandBase *createCommand (
+ kpCommandEnvironment *cmdEnviron) const Q_DECL_OVERRIDE;
protected slots:
void slotUpdateTypeLabel ();
diff --git a/widgets/imagelib/effects/kpEffectEmbossWidget.h b/widgets/imagelib/effects/kpEffectEmbossWidget.h
index d55204c..cb672d9 100644
--- a/widgets/imagelib/effects/kpEffectEmbossWidget.h
+++ b/widgets/imagelib/effects/kpEffectEmbossWidget.h
@@ -47,13 +47,13 @@ public:
kpEffectEmbossWidget (bool actOnSelection, QWidget *parent);
virtual ~kpEffectEmbossWidget ();
- virtual QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
- virtual bool isNoOp () const;
- virtual kpImage applyEffect (const kpImage &image);
+ bool isNoOp () const Q_DECL_OVERRIDE;
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
- virtual kpEffectCommandBase *createCommand (
- kpCommandEnvironment *cmdEnviron) const;
+ kpEffectCommandBase *createCommand (
+ kpCommandEnvironment *cmdEnviron) const Q_DECL_OVERRIDE;
protected:
int strength () const;
diff --git a/widgets/imagelib/effects/kpEffectFlattenWidget.h b/widgets/imagelib/effects/kpEffectFlattenWidget.h
index d5fb869..a5aa674 100644
--- a/widgets/imagelib/effects/kpEffectFlattenWidget.h
+++ b/widgets/imagelib/effects/kpEffectFlattenWidget.h
@@ -60,13 +60,13 @@ public:
// kpEffectWidgetBase interface
//
- virtual QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
- virtual bool isNoOp () const;
- virtual kpImage applyEffect (const kpImage &image);
+ bool isNoOp () const Q_DECL_OVERRIDE;
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
- virtual kpEffectCommandBase *createCommand (
- kpCommandEnvironment *cmdEnviron) const;
+ kpEffectCommandBase *createCommand (
+ kpCommandEnvironment *cmdEnviron) const Q_DECL_OVERRIDE;
protected slots:
void slotEnableChanged (bool enable);
diff --git a/widgets/imagelib/effects/kpEffectHSVWidget.h b/widgets/imagelib/effects/kpEffectHSVWidget.h
index 98a9db4..864ef66 100644
--- a/widgets/imagelib/effects/kpEffectHSVWidget.h
+++ b/widgets/imagelib/effects/kpEffectHSVWidget.h
@@ -44,13 +44,13 @@ public:
kpEffectHSVWidget (bool actOnSelection, QWidget *parent);
virtual ~kpEffectHSVWidget ();
- virtual QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
- virtual bool isNoOp () const;
- virtual kpImage applyEffect (const kpImage &image);
+ bool isNoOp () const Q_DECL_OVERRIDE;
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
- virtual kpEffectCommandBase *createCommand (
- kpCommandEnvironment *cmdEnviron) const;
+ kpEffectCommandBase *createCommand (
+ kpCommandEnvironment *cmdEnviron) const Q_DECL_OVERRIDE;
protected:
KDoubleNumInput *m_hueInput;
diff --git a/widgets/imagelib/effects/kpEffectInvertWidget.h b/widgets/imagelib/effects/kpEffectInvertWidget.h
index 40195f3..4eb1a5a 100644
--- a/widgets/imagelib/effects/kpEffectInvertWidget.h
+++ b/widgets/imagelib/effects/kpEffectInvertWidget.h
@@ -53,13 +53,13 @@ public:
// kpEffectWidgetBase interface
//
- virtual QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
- virtual bool isNoOp () const;
- virtual kpImage applyEffect (const kpImage &image);
+ bool isNoOp () const Q_DECL_OVERRIDE;
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
- virtual kpEffectCommandBase *createCommand (
- kpCommandEnvironment *cmdEnviron) const;
+ kpEffectCommandBase *createCommand (
+ kpCommandEnvironment *cmdEnviron) const Q_DECL_OVERRIDE;
protected slots:
void slotRGBCheckBoxToggled ();
diff --git a/widgets/imagelib/effects/kpEffectReduceColorsWidget.h b/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
index 56776a7..23ba4e9 100644
--- a/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
+++ b/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
@@ -52,13 +52,13 @@ public:
// kpEffectWidgetBase interface
//
- virtual QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
- virtual bool isNoOp () const;
- virtual kpImage applyEffect (const kpImage &image);
+ bool isNoOp () const Q_DECL_OVERRIDE;
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
- virtual kpEffectCommandBase *createCommand (
- kpCommandEnvironment *cmdEnviron) const;
+ kpEffectCommandBase *createCommand (
+ kpCommandEnvironment *cmdEnviron) const Q_DECL_OVERRIDE;
protected:
QRadioButton *m_blackAndWhiteRadioButton,
diff --git a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.h b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.h
index 772786c..2783a15 100644
--- a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.h
+++ b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.h
@@ -46,18 +46,18 @@ public:
QWidget *parent);
virtual ~kpEffectToneEnhanceWidget ();
- virtual QString caption () const;
+ QString caption () const Q_DECL_OVERRIDE;
private:
double amount () const;
double granularity () const;
public:
- virtual bool isNoOp () const;
- virtual kpImage applyEffect (const kpImage &image);
+ bool isNoOp () const Q_DECL_OVERRIDE;
+ kpImage applyEffect (const kpImage &image) Q_DECL_OVERRIDE;
- virtual kpEffectCommandBase *createCommand (
- kpCommandEnvironment *cmdEnviron) const;
+ kpEffectCommandBase *createCommand (
+ kpCommandEnvironment *cmdEnviron) const Q_DECL_OVERRIDE;
protected:
KDoubleNumInput *m_granularityInput;
diff --git a/widgets/kpColorCells.h b/widgets/kpColorCells.h
index 43f8412..315976a 100644
--- a/widgets/kpColorCells.h
+++ b/widgets/kpColorCells.h
@@ -154,7 +154,7 @@ signals:
void isModifiedChanged (bool isModified);
protected:
- virtual void contextMenuEvent (QContextMenuEvent *e);
+ void contextMenuEvent (QContextMenuEvent *e) Q_DECL_OVERRIDE;
protected slots:
void slotColorSelected (int cell, const QColor &color, Qt::MouseButton button);
diff --git a/widgets/kpDualColorButton.h b/widgets/kpDualColorButton.h
index 73441ef..3f4af60 100644
--- a/widgets/kpDualColorButton.h
+++ b/widgets/kpDualColorButton.h
@@ -67,7 +67,7 @@ public:
kpColor oldBackgroundColor () const;
public:
- virtual QSize sizeHint () const;
+ QSize sizeHint () const Q_DECL_OVERRIDE;
protected:
QRect swapPixmapRect () const;
@@ -75,17 +75,17 @@ protected:
QRect foregroundRect () const;
QRect backgroundRect () const;
- virtual void dragEnterEvent (QDragEnterEvent *e);
- virtual void dragMoveEvent (QDragMoveEvent *e);
- virtual void dropEvent (QDropEvent *e);
+ void dragEnterEvent (QDragEnterEvent *e) Q_DECL_OVERRIDE;
+ void dragMoveEvent (QDragMoveEvent *e) Q_DECL_OVERRIDE;
+ void dropEvent (QDropEvent *e) Q_DECL_OVERRIDE;
- virtual void mousePressEvent (QMouseEvent *e);
- virtual void mouseMoveEvent (QMouseEvent *e);
- virtual void mouseReleaseEvent (QMouseEvent *e);
+ void mousePressEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
+ void mouseMoveEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
- virtual void mouseDoubleClickEvent (QMouseEvent *e);
+ void mouseDoubleClickEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
- virtual void paintEvent (QPaintEvent *e);
+ void paintEvent (QPaintEvent *e) Q_DECL_OVERRIDE;
QPoint m_dragStartPoint;
kpColor m_color [2];
diff --git a/widgets/kpTransparentColorCell.h b/widgets/kpTransparentColorCell.h
index 3139603..9176e68 100644
--- a/widgets/kpTransparentColorCell.h
+++ b/widgets/kpTransparentColorCell.h
@@ -43,7 +43,7 @@ Q_OBJECT
public:
kpTransparentColorCell (QWidget *parent);
- virtual QSize sizeHint () const;
+ QSize sizeHint () const Q_DECL_OVERRIDE;
signals:
void transparentColorSelected (int mouseButton);
@@ -53,11 +53,11 @@ signals:
void backgroundColorChanged (const kpColor &color);
protected:
- virtual void mousePressEvent (QMouseEvent *e);
- virtual void contextMenuEvent (QContextMenuEvent *e);
- virtual void mouseReleaseEvent (QMouseEvent *e);
+ void mousePressEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
+ void contextMenuEvent (QContextMenuEvent *e) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
- virtual void paintEvent (QPaintEvent *e);
+ void paintEvent (QPaintEvent *e) Q_DECL_OVERRIDE;
QPixmap m_pixmap;
};
diff --git a/widgets/toolbars/kpColorToolBar.h b/widgets/toolbars/kpColorToolBar.h
index a4ae062..1ffc7c3 100644
--- a/widgets/toolbars/kpColorToolBar.h
+++ b/widgets/toolbars/kpColorToolBar.h
@@ -108,8 +108,8 @@ protected:
// Eat color drops (which are usually accidental drags from one of our
// child widgets) to prevent them from being pasted as text in the
// main window (by kpMainWindow::dropEvent()).
- virtual void dragEnterEvent (QDragEnterEvent *e);
- virtual void dragMoveEvent (QDragMoveEvent *e);
+ void dragEnterEvent (QDragEnterEvent *e) Q_DECL_OVERRIDE;
+ void dragMoveEvent (QDragMoveEvent *e) Q_DECL_OVERRIDE;
private:
void adjustToOrientation (Qt::Orientation o);
diff --git a/widgets/toolbars/kpToolToolBar.cpp b/widgets/toolbars/kpToolToolBar.cpp
index fbbab23..020ea24 100644
--- a/widgets/toolbars/kpToolToolBar.cpp
+++ b/widgets/toolbars/kpToolToolBar.cpp
@@ -63,7 +63,7 @@ public:
kpTool *tool() const { return m_tool; }
protected:
- virtual void mouseDoubleClickEvent(QMouseEvent *e)
+ void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE
{
if (e->button () == Qt::LeftButton && m_tool)
m_tool->globalDraw ();
diff --git a/widgets/toolbars/options/kpToolWidgetBase.h b/widgets/toolbars/options/kpToolWidgetBase.h
index 28109d1..d563d7e 100644
--- a/widgets/toolbars/options/kpToolWidgetBase.h
+++ b/widgets/toolbars/options/kpToolWidgetBase.h
@@ -95,10 +95,10 @@ signals:
void optionSelected (int row, int col);
protected:
- virtual bool event (QEvent *e);
+ bool event (QEvent *e) Q_DECL_OVERRIDE;
- virtual void mousePressEvent (QMouseEvent *e);
- virtual void paintEvent (QPaintEvent *e);
+ void mousePressEvent (QMouseEvent *e) Q_DECL_OVERRIDE;
+ void paintEvent (QPaintEvent *e) Q_DECL_OVERRIDE;
QWidget *m_baseWidget;
diff --git a/widgets/toolbars/options/kpToolWidgetBrush.h b/widgets/toolbars/options/kpToolWidgetBrush.h
index 2df6e31..81588d4 100644
--- a/widgets/toolbars/options/kpToolWidgetBrush.h
+++ b/widgets/toolbars/options/kpToolWidgetBrush.h
@@ -73,7 +73,7 @@ signals:
void brushChanged ();
protected slots:
- virtual bool setSelected (int row, int col, bool saveAsDefault);
+ bool setSelected (int row, int col, bool saveAsDefault) Q_DECL_OVERRIDE;
};
diff --git a/widgets/toolbars/options/kpToolWidgetEraserSize.h b/widgets/toolbars/options/kpToolWidgetEraserSize.h
index 40d2baa..a024cfb 100644
--- a/widgets/toolbars/options/kpToolWidgetEraserSize.h
+++ b/widgets/toolbars/options/kpToolWidgetEraserSize.h
@@ -74,7 +74,7 @@ signals:
void eraserSizeChanged (int size);
protected slots:
- virtual bool setSelected (int row, int col, bool saveAsDefault);
+ bool setSelected (int row, int col, bool saveAsDefault) Q_DECL_OVERRIDE;
};
diff --git a/widgets/toolbars/options/kpToolWidgetFillStyle.h b/widgets/toolbars/options/kpToolWidgetFillStyle.h
index 0987e26..cc97507 100644
--- a/widgets/toolbars/options/kpToolWidgetFillStyle.h
+++ b/widgets/toolbars/options/kpToolWidgetFillStyle.h
@@ -72,7 +72,7 @@ signals:
void fillStyleChanged (kpToolWidgetFillStyle::FillStyle fillStyle);
protected slots:
- virtual bool setSelected (int row, int col, bool saveAsDefault);
+ bool setSelected (int row, int col, bool saveAsDefault) Q_DECL_OVERRIDE;
};
diff --git a/widgets/toolbars/options/kpToolWidgetLineWidth.h b/widgets/toolbars/options/kpToolWidgetLineWidth.h
index a5b9e11..9c85fac 100644
--- a/widgets/toolbars/options/kpToolWidgetLineWidth.h
+++ b/widgets/toolbars/options/kpToolWidgetLineWidth.h
@@ -47,7 +47,7 @@ signals:
void lineWidthChanged (int width);
protected slots:
- virtual bool setSelected (int row, int col, bool saveAsDefault);
+ bool setSelected (int row, int col, bool saveAsDefault) Q_DECL_OVERRIDE;
};
diff --git a/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h b/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h
index 7b2c318..935422b 100644
--- a/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h
+++ b/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.h
@@ -50,7 +50,7 @@ signals:
void isOpaqueChanged (bool isOpaque);
protected slots:
- virtual bool setSelected (int row, int col, bool saveAsDefault);
+ bool setSelected (int row, int col, bool saveAsDefault) Q_DECL_OVERRIDE;
};
diff --git a/widgets/toolbars/options/kpToolWidgetSpraycanSize.h b/widgets/toolbars/options/kpToolWidgetSpraycanSize.h
index f9de91b..d86b0d4 100644
--- a/widgets/toolbars/options/kpToolWidgetSpraycanSize.h
+++ b/widgets/toolbars/options/kpToolWidgetSpraycanSize.h
@@ -47,7 +47,7 @@ signals:
void spraycanSizeChanged (int size);
protected slots:
- virtual bool setSelected (int row, int col, bool saveAsDefault);
+ bool setSelected (int row, int col, bool saveAsDefault) Q_DECL_OVERRIDE;
};