Fix some Qt deprecation warnings, memory leaks; clean up related code

YACReader/goto_flow.cpp

@@ -193,15 +193,6 @@ void GoToFlow::updateImageData()
     updateTimer->stop();
 }
 
-void GoToFlow::wheelEvent(QWheelEvent *event)
-{
-    if (event->delta() < 0)
-        flow->showNext();
-    else
-        flow->showPrevious();
-    event->accept();
-}
-
 void GoToFlow::setFlowType(FlowType flowType)
 {
     flow->setFlowType(flowType);

YACReader/goto_flow.h

@@ -31,7 +31,7 @@ class GoToFlow : public GoToFlowWidget
 {
     Q_OBJECT
 public:
-    GoToFlow(QWidget *parent = nullptr, FlowType flowType = CoverFlowLike);
+    explicit GoToFlow(QWidget *parent = nullptr, FlowType flowType = CoverFlowLike);
     ~GoToFlow() override;
     bool ready; //comic is ready for read.
 private:
@@ -47,7 +47,6 @@ class GoToFlow : public GoToFlowWidget
     QVector<QByteArray> rawImages;
     QTimer *updateTimer;
     PageLoader *worker;
-    void wheelEvent(QWheelEvent *event) override;
     QMutex mutexGoToFlow;
 
 private slots:

YACReader/goto_flow_gl.h

@@ -16,15 +16,15 @@ class GoToFlowGL : public GoToFlowWidget
 {
     Q_OBJECT
 public:
-    GoToFlowGL(QWidget *parent = nullptr, FlowType flowType = CoverFlowLike);
+    explicit GoToFlowGL(QWidget *parent = nullptr, FlowType flowType = CoverFlowLike);
     ~GoToFlowGL() override;
     void reset() override;
     void centerSlide(int slide) override;
     void setFlowType(FlowType flowType) override;
     void setNumSlides(unsigned int slides) override;
     void setImageReady(int index, const QByteArray &image) override;
 
-    void updateConfig(QSettings *settings);
+    void updateConfig(QSettings *settings) override;
     void setFlowRightToLeft(bool b) override;
 
 signals:

YACReader/goto_flow_toolbar.h

@@ -24,7 +24,7 @@ class GoToFlowToolBar : public QStackedWidget
     void paintEvent(QPaintEvent *) override;
 
 public:
-    GoToFlowToolBar(QWidget *parent = nullptr);
+    explicit GoToFlowToolBar(QWidget *parent = nullptr);
 
 public slots:
     void setPage(int pageNumber);

YACReader/goto_flow_widget.h

@@ -19,7 +19,7 @@ class GoToFlowWidget : public QWidget
     GoToFlowToolBar *toolBar;
 
 public:
-    GoToFlowWidget(QWidget *paret = nullptr);
+    explicit GoToFlowWidget(QWidget *paret = nullptr);
     ~GoToFlowWidget() override = 0;
 public slots:
     virtual void reset() = 0;

YACReader/magnifying_glass.cpp

@@ -141,31 +141,34 @@ void MagnifyingGlass::updateImage()
 }
 void MagnifyingGlass::wheelEvent(QWheelEvent *event)
 {
+    // TODO: consider handling horizontal scrolling differently.
+    const auto delta = event->angleDelta().x() + event->angleDelta().y();
+    const bool grow = delta < 0;
     switch (event->modifiers()) {
     //size
     case Qt::NoModifier:
-        if (event->delta() < 0)
+        if (grow)
             sizeUp();
         else
             sizeDown();
         break;
     //size height
     case Qt::ControlModifier:
-        if (event->delta() < 0)
+        if (grow)
             heightUp();
         else
             heightDown();
         break;
     //size width
     case Qt::AltModifier:
-        if (event->delta() < 0)
+        if (grow)
             widthUp();
         else
             widthDown();
         break;
     //zoom level
     case Qt::ShiftModifier:
-        if (event->delta() < 0)
+        if (grow)
             zoomIn();
         else
             zoomOut();

YACReader/viewer.cpp

@@ -691,14 +691,18 @@ static void animateScroll(QPropertyAnimation &scroller, const QScrollBar &scroll
 void Viewer::wheelEvent(QWheelEvent *event)
 {
     if (render->hasLoadedComic()) {
-        if (event->orientation() == Qt::Horizontal) {
-            animateScroll(*horizontalScroller, *horizontalScrollBar(), event->delta());
-            return;
+        const auto delta = event->angleDelta();
+        const auto verticalDelta = delta.y();
+
+        if (delta.x() != 0) {
+            animateScroll(*horizontalScroller, *horizontalScrollBar(), delta.x());
+            if (verticalDelta == 0)
+                return; // Pure horizontal scrolling => don't try to handle vertical delta.
         }
 
-        if ((event->delta() < 0) && (verticalScrollBar()->sliderPosition() == verticalScrollBar()->maximum())) {
+        if (verticalDelta < 0 && verticalScrollBar()->sliderPosition() == verticalScrollBar()->maximum()) {
             if (wheelStop) {
-                if (getMovement(event) == Forward) {
+                if (getMovement(event, Qt::Vertical) == Forward) {
                     next();
                     verticalScroller->stop();
                     event->accept();
@@ -708,9 +712,9 @@ void Viewer::wheelEvent(QWheelEvent *event)
             } else
                 wheelStop = true;
         } else {
-            if ((event->delta() > 0) && (verticalScrollBar()->sliderPosition() == verticalScrollBar()->minimum())) {
+            if (verticalDelta > 0 && verticalScrollBar()->sliderPosition() == verticalScrollBar()->minimum()) {
                 if (wheelStop) {
-                    if (getMovement(event) == Backward) {
+                    if (getMovement(event, Qt::Vertical) == Backward) {
                         prev();
                         verticalScroller->stop();
                         event->accept();
@@ -722,7 +726,7 @@ void Viewer::wheelEvent(QWheelEvent *event)
             }
         }
 
-        animateScroll(*verticalScroller, *verticalScrollBar(), event->delta());
+        animateScroll(*verticalScroller, *verticalScrollBar(), verticalDelta);
     }
 }
 

YACReaderLibrary/comic_flow.cpp

@@ -103,15 +103,6 @@ void ComicFlow::keyPressEvent(QKeyEvent *event)
     PictureFlow::keyPressEvent(event);
 }
 
-void ComicFlow::wheelEvent(QWheelEvent *event)
-{
-    if (event->delta() < 0)
-        showNext();
-    else
-        showPrevious();
-    event->accept();
-}
-
 void ComicFlow::removeSlide(int cover)
 {
     imageFiles.removeAt(cover);

YACReaderLibrary/comic_flow.h

@@ -7,7 +7,6 @@
 #include <QImage>
 #include <QString>
 #include <QTimer>
-#include <QWheelEvent>
 
 #include <memory>
 
@@ -18,7 +17,7 @@ class ComicFlow : public YACReaderFlow
 {
     Q_OBJECT
 public:
-    ComicFlow(QWidget *parent = nullptr, FlowType flowType = CoverFlowLike);
+    explicit ComicFlow(QWidget *parent = nullptr, FlowType flowType = CoverFlowLike);
     ~ComicFlow() override;
 
     void setImagePaths(const QStringList &paths);
@@ -41,7 +40,6 @@ private slots:
     int workerIndex;
     QTimer updateTimer;
     std::unique_ptr<WorkerThread<QImage>> worker;
-    virtual void wheelEvent(QWheelEvent *event);
 };
 
 #endif

YACReaderLibrary/comic_flow_widget.h

@@ -12,7 +12,7 @@ class ComicFlowWidget : public QWidget
 {
     Q_OBJECT
 public:
-    ComicFlowWidget(QWidget *paret = nullptr);
+    explicit ComicFlowWidget(QWidget *paret = nullptr);
 
 public slots:
     virtual void setShowMarks(bool value) = 0;
@@ -44,7 +44,7 @@ class ComicFlowWidgetSW : public ComicFlowWidget
     ComicFlow *flow;
 
 public:
-    ComicFlowWidgetSW(QWidget *parent = nullptr);
+    explicit ComicFlowWidgetSW(QWidget *parent = nullptr);
 
     void setShowMarks(bool value) override;
     void setMarks(QVector<YACReaderComicReadStatus> marks) override;
@@ -56,7 +56,7 @@ class ComicFlowWidgetSW : public ComicFlowWidget
     void setImagePaths(QStringList paths) override;
     void setCenterIndex(int index) override;
     void showSlide(int index) override;
-    int centerIndex();
+    int centerIndex() override;
     void updateMarks() override;
     void setFlowType(FlowType flowType) override;
     void render() override;
@@ -70,7 +70,7 @@ class ComicFlowWidgetSW : public ComicFlowWidget
     void mousePressEvent(QMouseEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
     void mouseDoubleClickEvent(QMouseEvent *event) override;
-    QSize minimumSizeHint() const;
+    QSize minimumSizeHint() const override;
     QSize sizeHint() const override;
     QSize slideSizeW;
     QSize slideSizeF;
@@ -84,7 +84,7 @@ class ComicFlowWidgetGL : public ComicFlowWidget
     YACReaderComicFlowGL *flow;
 
 public:
-    ComicFlowWidgetGL(QWidget *parent = nullptr);
+    explicit ComicFlowWidgetGL(QWidget *parent = nullptr);
 
     void setShowMarks(bool value) override;
     void setMarks(QVector<YACReaderComicReadStatus> marks) override;
@@ -96,7 +96,7 @@ class ComicFlowWidgetGL : public ComicFlowWidget
     void setImagePaths(QStringList paths) override;
     void setCenterIndex(int index) override;
     void showSlide(int index) override;
-    int centerIndex();
+    int centerIndex() override;
     void updateMarks() override;
     void setFlowType(FlowType flowType) override;
     void render() override;

YACReaderLibrary/import_widget.cpp

@@ -12,8 +12,6 @@
 #include <QTimeLine>
 //TODO: is QGLWidget needed here???
 //#include <QGLWidget>
-#include <QTimer>
-#include <QElapsedTimer>
 #include <QToolButton>
 #include <QResizeEvent>
 
@@ -208,8 +206,7 @@ ImportWidget::ImportWidget(QWidget *parent)
 
     previousWidth = 0;
     updatingCovers = false;
-    elapsedTimer = new QElapsedTimer();
-    elapsedTimer->start();
+    elapsedTimer.start();
 }
 
 void ImportWidget::newComic(const QString &path, const QString &coverPath)
@@ -219,10 +216,11 @@ void ImportWidget::newComic(const QString &path, const QString &coverPath)
 
     currentComicLabel->setText("<font color=\"#565959\">" + path + "</font>");
 
-    if (((elapsedTimer->elapsed() >= 1100) || ((previousWidth < coversView->width()) && (elapsedTimer->elapsed() >= 500))) && scrollAnimation->state() != QAbstractAnimation::Running) //todo elapsed time
+    const auto elapsedMs = elapsedTimer.elapsed();
+    if ((elapsedMs >= 1100 || (previousWidth < coversView->width() && elapsedMs >= 500)) && scrollAnimation->state() != QAbstractAnimation::Running) //todo elapsed time
     {
         updatingCovers = true;
-        elapsedTimer->start();
+        elapsedTimer.start();
 
         QPixmap p(coverPath);
         p = p.scaledToHeight(300, Qt::SmoothTransformation);

YACReaderLibrary/import_widget.h

@@ -1,6 +1,7 @@
 #ifndef IMPORT_WIDGET_H
 #define IMPORT_WIDGET_H
 
+#include <QElapsedTimer>
 #include <QtWidgets>
 
 class ImportWidget : public QWidget
@@ -36,7 +37,7 @@ public slots:
 
     int previousWidth;
     bool updatingCovers;
-    QElapsedTimer *elapsedTimer;
+    QElapsedTimer elapsedTimer;
     quint64 i;
 
     QToolButton *hideButton;

common/gl/yacreader_flow_gl.h

@@ -122,9 +122,9 @@ class YACReaderFlowGL : public QOpenGLWidget, public ScrollManagement
     QOpenGLTexture *defaultTexture = nullptr;
     QOpenGLTexture *markTexture = nullptr;
     QOpenGLTexture *readingTexture = nullptr;
-    void initializeGL();
-    void paintGL();
-    void timerEvent(QTimerEvent *);
+    void initializeGL() override;
+    void paintGL() override;
+    void timerEvent(QTimerEvent *) override;
 
     //number of Covers
     int numObjects;
@@ -172,11 +172,11 @@ class YACReaderFlowGL : public QOpenGLWidget, public ScrollManagement
 
 public:
     /*Constructor*/
-    YACReaderFlowGL(QWidget *parent = 0, struct Preset p = pressetYACReaderFlowDownConfig);
-    virtual ~YACReaderFlowGL();
+    explicit YACReaderFlowGL(QWidget *parent = nullptr, struct Preset p = pressetYACReaderFlowDownConfig);
+    ~YACReaderFlowGL() override;
 
     //size;
-    QSize minimumSizeHint() const;
+    QSize minimumSizeHint() const override;
     //QSize sizeHint() const;
 
     /*functions*/
@@ -267,11 +267,11 @@ public slots:
 
     //void paintEvent(QPaintEvent *event);
     QVector3D getPlaneIntersection(int x, int y, YACReader3DImage plane);
-    void mouseDoubleClickEvent(QMouseEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-    void wheelEvent(QWheelEvent *event);
-    void keyPressEvent(QKeyEvent *event);
-    void resizeGL(int width, int height);
+    void mouseDoubleClickEvent(QMouseEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void wheelEvent(QWheelEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+    void resizeGL(int width, int height) override;
     friend class ImageLoaderGL;
     friend class ImageLoaderByteArrayGL;
 
@@ -283,10 +283,10 @@ public slots:
 class YACReaderComicFlowGL : public YACReaderFlowGL
 {
 public:
-    YACReaderComicFlowGL(QWidget *parent = 0, struct Preset p = defaultYACReaderFlowConfig);
+    explicit YACReaderComicFlowGL(QWidget *parent = nullptr, struct Preset p = defaultYACReaderFlowConfig);
     void setImagePaths(QStringList paths);
-    void updateImageData();
-    void remove(int item);
+    void updateImageData() override;
+    void remove(int item) override;
     void resortCovers(QList<int> newOrder);
     friend class ImageLoaderGL;
 
@@ -300,9 +300,9 @@ class YACReaderComicFlowGL : public YACReaderFlowGL
 class YACReaderPageFlowGL : public YACReaderFlowGL
 {
 public:
-    YACReaderPageFlowGL(QWidget *parent = 0, struct Preset p = defaultYACReaderFlowConfig);
-    ~YACReaderPageFlowGL();
-    void updateImageData();
+    explicit YACReaderPageFlowGL(QWidget *parent = nullptr, struct Preset p = defaultYACReaderFlowConfig);
+    ~YACReaderPageFlowGL() override;
+    void updateImageData() override;
     void populate(int n);
     QVector<bool> imagesReady;
     QVector<QByteArray> rawImages;

common/onstart_flow_selection_dialog.h

@@ -7,7 +7,7 @@ class OnStartFlowSelectionDialog : public QDialog
 {
     Q_OBJECT
 public:
-    OnStartFlowSelectionDialog(QWidget *parent = 0);
+    explicit OnStartFlowSelectionDialog(QWidget *parent = nullptr);
 };
 
-#endif
+#endif