diff --git a/data/translations/Internationalization_uk.ts b/data/translations/Internationalization_uk.ts
index ed867216..51f286e3 100644
--- a/data/translations/Internationalization_uk.ts
+++ b/data/translations/Internationalization_uk.ts
@@ -117,7 +117,7 @@
Delay:
- Затримка:
+ Затримка:
diff --git a/src/tools/abstractactiontool.h b/src/tools/abstractactiontool.h
index 0c973c91..1dba903c 100644
--- a/src/tools/abstractactiontool.h
+++ b/src/tools/abstractactiontool.h
@@ -36,9 +36,6 @@ public:
void paintMousePreview(QPainter& painter,
const CaptureContext& context) override;
-protected:
- virtual ToolType nameID() const = 0;
-
public slots:
void drawEnd(const QPoint& p) override;
void drawMove(const QPoint& p) override;
diff --git a/src/tools/abstractpathtool.h b/src/tools/abstractpathtool.h
index f1f4cfe3..8b4a93f9 100644
--- a/src/tools/abstractpathtool.h
+++ b/src/tools/abstractpathtool.h
@@ -42,8 +42,6 @@ protected:
void updateBackup(const QPixmap& pixmap);
void addPoint(const QPoint& point);
- virtual ToolType nameID() const = 0;
-
QPixmap m_pixmapBackup;
QRect m_backupArea;
QColor m_color;
diff --git a/src/tools/abstracttwopointtool.h b/src/tools/abstracttwopointtool.h
index 061807a9..3a83bbec 100644
--- a/src/tools/abstracttwopointtool.h
+++ b/src/tools/abstracttwopointtool.h
@@ -53,8 +53,6 @@ protected:
bool m_supportsOrthogonalAdj = false;
bool m_supportsDiagonalAdj = false;
- virtual ToolType nameID() const = 0;
-
private:
QPoint adjustedVector(QPoint v) const;
};
diff --git a/src/tools/copy/copytool.h b/src/tools/copy/copytool.h
index f8fe081b..20f1f243 100644
--- a/src/tools/copy/copytool.h
+++ b/src/tools/copy/copytool.h
@@ -25,7 +25,7 @@ class CopyTool : public AbstractActionTool
public:
explicit CopyTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/exit/exittool.h b/src/tools/exit/exittool.h
index 109b3e32..be586995 100644
--- a/src/tools/exit/exittool.h
+++ b/src/tools/exit/exittool.h
@@ -25,7 +25,7 @@ class ExitTool : public AbstractActionTool
public:
explicit ExitTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/launcher/applaunchertool.h b/src/tools/launcher/applaunchertool.h
index 9a7513a7..9da32d00 100644
--- a/src/tools/launcher/applaunchertool.h
+++ b/src/tools/launcher/applaunchertool.h
@@ -25,7 +25,7 @@ class AppLauncher : public AbstractActionTool
public:
explicit AppLauncher(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/move/movetool.h b/src/tools/move/movetool.h
index dd36d98d..76e1f7f9 100644
--- a/src/tools/move/movetool.h
+++ b/src/tools/move/movetool.h
@@ -25,7 +25,7 @@ class MoveTool : public AbstractActionTool
public:
explicit MoveTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/pin/pintool.h b/src/tools/pin/pintool.h
index 0192f53d..ec781be2 100644
--- a/src/tools/pin/pintool.h
+++ b/src/tools/pin/pintool.h
@@ -25,7 +25,7 @@ class PinTool : public AbstractActionTool
public:
explicit PinTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/redo/redotool.h b/src/tools/redo/redotool.h
index 4c0791a0..b23b4bc9 100644
--- a/src/tools/redo/redotool.h
+++ b/src/tools/redo/redotool.h
@@ -25,7 +25,7 @@ class RedoTool : public AbstractActionTool
public:
explicit RedoTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/save/savetool.h b/src/tools/save/savetool.h
index 3c79e442..64f6306b 100644
--- a/src/tools/save/savetool.h
+++ b/src/tools/save/savetool.h
@@ -25,7 +25,7 @@ class SaveTool : public AbstractActionTool
public:
explicit SaveTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/selection/selectiontool.h b/src/tools/selection/selectiontool.h
index f8448dbd..a7151da3 100644
--- a/src/tools/selection/selectiontool.h
+++ b/src/tools/selection/selectiontool.h
@@ -25,7 +25,7 @@ class SelectionTool : public AbstractTwoPointTool
public:
explicit SelectionTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/sizeindicator/sizeindicatortool.h b/src/tools/sizeindicator/sizeindicatortool.h
index 26fca63c..57aad37f 100644
--- a/src/tools/sizeindicator/sizeindicatortool.h
+++ b/src/tools/sizeindicator/sizeindicatortool.h
@@ -25,7 +25,7 @@ class SizeIndicatorTool : public AbstractActionTool
public:
explicit SizeIndicatorTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/tools/storage/imguploadertool.h b/src/tools/storage/imguploadertool.h
index f0928e55..59fa9503 100644
--- a/src/tools/storage/imguploadertool.h
+++ b/src/tools/storage/imguploadertool.h
@@ -9,12 +9,12 @@ class ImgUploaderTool : public AbstractActionTool
public:
explicit ImgUploaderTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QString name() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
- void setCapture(const QPixmap& pixmap);
+ void setCapture(const QPixmap& pixmap) override;
const QPixmap& capture();
public slots:
diff --git a/src/tools/undo/undotool.h b/src/tools/undo/undotool.h
index 140407ea..52292a19 100644
--- a/src/tools/undo/undotool.h
+++ b/src/tools/undo/undotool.h
@@ -25,7 +25,7 @@ class UndoTool : public AbstractActionTool
public:
explicit UndoTool(QObject* parent = nullptr);
- bool closeOnButtonPressed() const;
+ bool closeOnButtonPressed() const override;
QIcon icon(const QColor& background, bool inEditor) const override;
QString name() const override;
diff --git a/src/widgets/draggablewidgetmaker.cpp b/src/widgets/draggablewidgetmaker.cpp
index c738dc62..70963e90 100644
--- a/src/widgets/draggablewidgetmaker.cpp
+++ b/src/widgets/draggablewidgetmaker.cpp
@@ -73,6 +73,8 @@ bool DraggableWidgetMaker::eventFilter(QObject* obj, QEvent* event)
return true;
}
} break;
+ default:
+ break;
}
return QObject::eventFilter(obj, event);