From 039887f2e6dbec59cc17b291ff47c8c6e094a086 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Sat, 1 May 2021 01:35:28 +0100
Subject: [PATCH] Fix deprecated Qt functions

Change the way to get the screen size
Remove Qt::WindowFlags
Change function to process events from mouse wheel
---
 app/PlotSubWindow.cpp   |  6 +++++-
 app/SubWindowHandle.cpp | 14 +++++++++-----
 app/SubWindowHandle.h   |  2 +-
 app/VideoSubWindow.cpp  |  2 +-
 app/VideoSubWindow.h    |  1 -
 app/ViewArea.cpp        |  2 +-
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/PlotSubWindow.cpp b/app/PlotSubWindow.cpp
index 22a3397..2d540b2 100644
--- a/app/PlotSubWindow.cpp
+++ b/app/PlotSubWindow.cpp
@@ -24,6 +24,10 @@
 
 #include "PlotSubWindow.h"
 
+#include <QGuiApplication>
+#include <QScreen>
+#include <QSize>
+
 #include "qcustomplot.h"
 //#include "external/qcustomplot/qcustomplot.h"
 
@@ -174,7 +178,7 @@ QSize PlotSubWindow::sizeHint() const
   }
   else
   {
-    maxSize = QApplication::desktop()->availableGeometry().size();
+    maxSize = QGuiApplication::screens()[0]->availableGeometry().size();
   }
   return sizeHint( maxSize );
 }
diff --git a/app/SubWindowHandle.cpp b/app/SubWindowHandle.cpp
index 5b6e6a9..fee8de7 100644
--- a/app/SubWindowHandle.cpp
+++ b/app/SubWindowHandle.cpp
@@ -29,10 +29,12 @@
 #include <QActionGroup>
 #include <QApplication>
 #include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QHBoxLayout>
 #include <QMdiArea>
 #include <QMenu>
 #include <QPainter>
+#include <QScreen>
 #include <QSettings>
 #include <QSignalMapper>
 #include <QStyle>
@@ -154,7 +156,7 @@ void SubWindowHandle::setWindowMode( int iWindowMode )
     parentWidget()->update();
     m_pcApp->showNormal();
     qApp->processEvents();
-    QSize screenSize = QApplication::desktop()->availableGeometry().size();
+    QSize screenSize = QGuiApplication::screens()[0]->availableGeometry().size();
     m_pcApp->move( 0, 0 );
     m_pcApp->resize( screenSize.width(), 5 );
     m_pcApp->setWindowTitle( QApplication::applicationName() );
@@ -230,12 +232,14 @@ void SubWindowHandle::addMdiSubWindow( SubWindowAbstract* window )
            SLOT( removeMdiSubWindow( MdiSubWindow* ) ) );
 }
 
-void SubWindowHandle::addSubWindow( SubWindowAbstract* window, Qt::WindowFlags flags )
+void SubWindowHandle::addSubWindow( SubWindowAbstract* window )
 {
   if( window )
   {
-    connect( window, SIGNAL( updateStatusBar( const QString& ) ), m_pcApp, SLOT( printMessage( const QString& ) ) );
-    connect( window, SIGNAL( zoomFactorChanged( const double, const QPoint ) ), m_pcApp, SLOT( updateZoomFactorSBox() ) );
+    connect( window, SIGNAL( updateStatusBar( const QString& ) ), m_pcApp,
+            SLOT( printMessage( const QString& ) ) );
+    connect( window, SIGNAL( zoomFactorChanged( const double, const QPoint ) ), m_pcApp,
+            SLOT( updateZoomFactorSBox() ) );
     if( m_iWindowMode == DETACHEDSUBWINDOWMODE )
     {
       connect( window, SIGNAL( aboutToActivate( SubWindowAbstract* ) ), this,
@@ -378,7 +382,7 @@ void SubWindowHandle::tileSubWindows()
 
   if( m_iWindowMode == DETACHEDSUBWINDOWMODE )
   {
-    QSize screenSize = QApplication::desktop()->availableGeometry().size();
+    QSize screenSize = QGuiApplication::screens()[0]->availableGeometry().size();
     unsigned int minWindowsInRow = 1;
     while( ( screenSize.width() / minWindowsInRow ) > 500 )
     {
diff --git a/app/SubWindowHandle.h b/app/SubWindowHandle.h
index 157060f..f0095a3 100644
--- a/app/SubWindowHandle.h
+++ b/app/SubWindowHandle.h
@@ -51,7 +51,7 @@ public:
 
   void processLogMsg( const QString& msg );
 
-  void addSubWindow( SubWindowAbstract* widget, Qt::WindowFlags flags = 0 );
+  void addSubWindow( SubWindowAbstract* widget );
 
   SubWindowAbstract* activeSubWindow() const;
 
diff --git a/app/VideoSubWindow.cpp b/app/VideoSubWindow.cpp
index af20c8b..6e62879 100644
--- a/app/VideoSubWindow.cpp
+++ b/app/VideoSubWindow.cpp
@@ -259,7 +259,7 @@ QSize VideoSubWindow::sizeHint() const
   }
   else
   {
-    maxSize = QApplication::desktop()->availableGeometry().size();
+    maxSize = QGuiApplication::screens()[0]->availableGeometry().size();
   }
   return sizeHint( maxSize );
 }
diff --git a/app/VideoSubWindow.h b/app/VideoSubWindow.h
index 291159c..26a30e5 100644
--- a/app/VideoSubWindow.h
+++ b/app/VideoSubWindow.h
@@ -182,7 +182,6 @@ public:
   QSize sizeHint( const QSize& ) const;
 
   QString getCurrentFileName() { return m_cFilename; }
-  bool getIsModule() { return getCategory() | SubWindowAbstract::MODULE_SUBWINDOW; }
   void clearWindowBusy() { m_bWindowBusy = false; }
   void setFillWindow( bool bFlag );
 
diff --git a/app/ViewArea.cpp b/app/ViewArea.cpp
index 547e5bb..043f114 100644
--- a/app/ViewArea.cpp
+++ b/app/ViewArea.cpp
@@ -730,7 +730,7 @@ void ViewArea::wheelEvent( QWheelEvent* event )
 
   if( event->modifiers() & Qt::ControlModifier )
   {
-    scale = 0.001 * event->delta();
+    scale = 0.001 * event->angleDelta().y();
     if( scale > 0 )
       scale = 1.25;
     else