From b6b6863331ccec41fbf5bc8602ee608ae482feed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Fri, 20 May 2022 10:33:45 +0200 Subject: [PATCH] Add override keyword --- databaseview.h | 4 ++-- filesystemwidget.h | 6 +++--- imageinfo.h | 2 +- imageringlist.h | 2 +- imagescrollarea.h | 12 ++++++------ imagescrollareagl.h | 28 ++++++++++++++-------------- loadrunable.h | 4 ++-- mainwindow.h | 8 ++++---- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/databaseview.h b/databaseview.h index 948a3f4..f566ce9 100644 --- a/databaseview.h +++ b/databaseview.h @@ -29,7 +29,7 @@ class FITSFileModel : public QSqlQueryModel QStringList m_value; public: FITSFileModel(QObject *parent = nullptr); - void sort(int column, Qt::SortOrder order); + void sort(int column, Qt::SortOrder order) override; void setColumns(const QStringList &columns); void setFilter(const QStringList &key, const QStringList &value); protected: @@ -46,7 +46,7 @@ class DataBaseView : public QWidget QLineEdit *m_search[3]; public: explicit DataBaseView(Database *database, QWidget *parent = nullptr); - ~DataBaseView(); + ~DataBaseView() override; public slots: void selectColumns(); void loadDatabase(); diff --git a/filesystemwidget.h b/filesystemwidget.h index 039a106..5053265 100644 --- a/filesystemwidget.h +++ b/filesystemwidget.h @@ -28,9 +28,9 @@ class Filetree : public QTreeView QString m_rootDir; public: explicit Filetree(QWidget *parent = nullptr); - ~Filetree(); - void contextMenuEvent(QContextMenuEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); + ~Filetree() override; + void contextMenuEvent(QContextMenuEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; signals: void fileSelected(const QString &path); void copyFiles(const QString &path); diff --git a/imageinfo.h b/imageinfo.h index d57538f..2f9a6fe 100644 --- a/imageinfo.h +++ b/imageinfo.h @@ -32,7 +32,7 @@ class ImageInfo : public QTreeWidget Q_OBJECT public: explicit ImageInfo(QWidget *parent); - ~ImageInfo(); + ~ImageInfo() override; public slots: void setInfo(const ImageInfoData &info); }; diff --git a/imageringlist.h b/imageringlist.h index 40ea6da..7e4d239 100644 --- a/imageringlist.h +++ b/imageringlist.h @@ -59,7 +59,7 @@ class ImageRingList : public QAbstractItemModel QThreadPool *m_thumbPool; public: explicit ImageRingList(QObject *parent = 0); - ~ImageRingList(); + ~ImageRingList() override; bool setDir(const QString path, const QString ¤tFile = QString()); void setFile(const QString &file); ImagePtr currentImage(); diff --git a/imagescrollarea.h b/imagescrollarea.h index d22240f..2f5822f 100644 --- a/imagescrollarea.h +++ b/imagescrollarea.h @@ -21,12 +21,12 @@ public slots: void bestFit(); void oneToOne(); protected: - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void resizeEvent(QResizeEvent *event); - void wheelEvent(QWheelEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void wheelEvent(QWheelEvent *event) override; }; #endif // IMAGESCROLLAREA_H diff --git a/imagescrollareagl.h b/imagescrollareagl.h index 3a528aa..2967d7d 100644 --- a/imagescrollareagl.h +++ b/imagescrollareagl.h @@ -55,7 +55,7 @@ class ImageWidget : public QOpenGLWidget QVector m_thumnails; public: explicit ImageWidget(QWidget *parent = nullptr); - ~ImageWidget(); + ~ImageWidget() override; void setImage(const RawImage *image, int index); void setImage(const QPixmap &pixmap); void setScale(float scale); @@ -70,14 +70,14 @@ public slots: void thumbnailLoaded(const Image *image); void showThumbnail(bool enable); protected: - void paintGL(); - void resizeGL(int w, int h); - void initializeGL(); - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void paintGL() override; + void resizeGL(int w, int h) override; + void initializeGL() override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; void thumbSelect(QMouseEvent *event); signals: void fileDropped(const QString &path); @@ -97,16 +97,16 @@ class ImageScrollAreaGL : public QWidget int m_thumbCount; public: explicit ImageScrollAreaGL(QWidget *parent = nullptr); - ~ImageScrollAreaGL(); + ~ImageScrollAreaGL() override; void setImage(RawImage *image, int index); ImageWidget* imageWidget(); void setThumbnails(int count); protected: void updateScrollbars(bool zoom = false); - void resizeEvent(QResizeEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *event); + void resizeEvent(QResizeEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *event) override; void zoom(float delta); public slots: void zoomIn(); diff --git a/loadrunable.h b/loadrunable.h index d2fb63b..2be477b 100644 --- a/loadrunable.h +++ b/loadrunable.h @@ -18,7 +18,7 @@ class LoadRunable : public QRunnable bool m_thumbnail; public: LoadRunable(const QString &file, Image *receiver, AnalyzeLevel level, bool thumbnail = false); - void run(); + void run() override; }; class ConvertRunable : public QRunnable @@ -27,7 +27,7 @@ class ConvertRunable : public QRunnable QString m_outfile; public: ConvertRunable(const QString &in, const QString &out); - void run(); + void run() override; }; #endif // LOADRUNABLE_H diff --git a/mainwindow.h b/mainwindow.h index 8aa37cd..9f70a01 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -30,13 +30,13 @@ class MainWindow : public QMainWindow bool _maximized; public: MainWindow(QWidget *parent = 0); - ~MainWindow(); + ~MainWindow() override; protected: - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; void setupSigterm(); static void signalHandler(int); - void closeEvent(QCloseEvent *event); + void closeEvent(QCloseEvent *event) override; void copyOrMove(bool copy); void copyOrMove(bool copy, const QString &dest); protected slots: