Changeset 94065 in vbox

Timestamp:

Mar 2, 2022 8:58:24 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: The QtMac header is gone in qt6, so use QPixmap::toImage+QImage::toCGImage (5.5 or earlier); QImage::byteCount -> QImage::sizeInBytes (5.10); Qt::MidButton -> Qt::MiddleButton. bugref:9898

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp

@@ -16 +16 @@
  */
 
-#include "VBoxUtils-darwin.h"
-#include "VBoxCocoaHelper.h"
-#include "UICocoaApplication.h"
-
-#include <iprt/mem.h>
-#include <iprt/assert.h>
-
+/* Qt includes: */
 #include <QMainWindow>
 #include <QApplication>
@@ -30 +24 @@
 #include <QPixmap>
 #include <QContextMenuEvent>
-#include <QtMac>
-
+
+/* GUI includes: */
+#include "VBoxUtils-darwin.h"
+#include "VBoxCocoaHelper.h"
+#include "UICocoaApplication.h"
+
+/* Other VBox includes: */
+#include <iprt/mem.h>
+#include <iprt/assert.h>
+
+/* System includes: */
 #include <Carbon/Carbon.h>
 
@@ -283 +286 @@
 
     CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-    CGDataProviderRef dp = CGDataProviderCreateWithData(imageCopy, pImage->bits(), pImage->byteCount(), darwinDataProviderReleaseQImage);
+    CGDataProviderRef dp = CGDataProviderCreateWithData(imageCopy, pImage->bits(), pImage->sizeInBytes(),
+                                                        darwinDataProviderReleaseQImage);
 
     CGBitmapInfo bmpInfo = kCGImageAlphaFirst | kCGBitmapByteOrder32Host;
@@ -322 +326 @@
                                               kCGImageAlphaPremultipliedFirst);
     /* Get the CGImageRef from Qt */
-    CGImageRef qtPixmap = QtMac::toCGImageRef(*pPixmap);
+    CGImageRef qtPixmap = pPixmap->toImage().toCGImage();
     /* Draw the image from Qt & convert the context back to a new CGImageRef. */
     CGContextDrawImage(ctx, CGRectMake(0, 0, pPixmap->width(), pPixmap->height()), qtPixmap);
@@ -407 +411 @@
         qtExtraButton = Qt::RightButton;
     else if (button == 2)
-        qtExtraButton = Qt::MidButton;
+        qtExtraButton = Qt::MiddleButton;
     else if (button == 3)
         qtExtraButton = Qt::XButton1;
@@ -498 +502 @@
         qtButtons |= Qt::RightButton;
     if ((buttons & RT_BIT_32(2)) == RT_BIT_32(2))
-        qtButtons |= Qt::MidButton;
+        qtButtons |= Qt::MiddleButton;
     if ((buttons & RT_BIT_32(3)) == RT_BIT_32(3))
         qtButtons |= Qt::XButton1;
@@ -548 +552 @@
 /********************************************************************************
  *
- * Old carbon stuff. Have to converted soon!
+ * Old carbon stuff. Have to convert soon!
  *
  ********************************************************************************/