Minimal changes required for Qt6

shaperilio · shaperilio · commit f70ea9ec4e1b · 2021-04-19T09:13:36.000-07:00
diff --git a/ImageWindow.cpp b/ImageWindow.cpp
@@ -5,7 +5,6 @@
 #include <QDebug>
 #include <QScrollBar>
 #include <QFontDatabase>
-#include <QDesktopWidget>
 #include <QDir>
 #include <iostream>
 #include <QCollator>
@@ -707,9 +706,9 @@ void ImageWindow::zoomFit()
 
     zoomLevel = (int)floor(qMin(wLevel, hLevel));
     zoomFactor = pow(zoomStep, zoomLevel);
-    QMatrix scaleMatrix;
+    QTransform scaleMatrix;
     scaleMatrix.scale(zoomFactor, zoomFactor);
-    setTransform(QTransform(scaleMatrix));
+    setTransform(scaleMatrix);
     showCentered();
 }
 
@@ -778,9 +777,9 @@ void ImageWindow::zoom(int zoomIncrement)
         zoomFactor = pow(zoomStep, zoomLevel);
     }
     auto zoomLocationOnImageBefore = mapToScene(zoomCtr);
-    QMatrix scaleMatrix;
+    QTransform scaleMatrix;
     scaleMatrix.scale(zoomFactor, zoomFactor);
-    setTransform(QTransform(scaleMatrix));
+    setTransform(scaleMatrix);
     auto zoomCtrAfter = mapFromScene(zoomLocationOnImageBefore);
     auto zoomLocationDelta = zoomCtrAfter - zoomCtr;
     horizontalScrollBar()->setValue(horizontalScrollBar()->value() + zoomLocationDelta.x());
diff --git a/MainDialog.cpp b/MainDialog.cpp
@@ -1,7 +1,6 @@
 #include "MainDialog.h"
 #include "ui_MainDialog.h"
 #include "ImageWindow.h"
-#include <QDesktopWidget>
 #include <QKeyEvent>
 #include <QDebug>
 #include <QFileDialog>
diff --git a/definitions.h b/definitions.h
@@ -1,7 +1,7 @@
 #ifndef DEFINITIONS_H
 #define DEFINITIONS_H
 
-#define VERSION_STRING	"2021-02-17"
+#define VERSION_STRING	"2021-04-19"
 
 #endif // DEFINITIONS_H
 
diff --git a/ui_MainDialog.h b/ui_MainDialog.h
@@ -10,7 +10,6 @@
 #define UI_MAINDIALOG_H
 
 #include <QtCore/QVariant>
-#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QButtonGroup>
 #include <QtWidgets/QCheckBox>
