From b601eb9c2d89f6869e27744d5ef8e208acf2f4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 18 Aug 2021 21:50:32 +0200
Subject: macOS: Reorder QNSView instance variables

Pick-to: 6.2
Change-Id: Icde9ee6744290f88eaa2ac197c40ba412543b122
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/plugins/platforms/cocoa/qnsview.mm | 37 +++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 14 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qnsview.mm')

diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index e2dd496dae..c3884414e6 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -120,35 +120,35 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
 
 @implementation QNSView {
     QPointer<QCocoaWindow> m_platformWindow;
+
+    // Mouse
+    QNSViewMouseMoveHelper *m_mouseMoveHelper;
     Qt::MouseButtons m_buttons;
     Qt::MouseButtons m_acceptedMouseDowns;
     Qt::MouseButtons m_frameStrutButtons;
-    QString m_composingText;
-    QPointer<QObject> m_composingFocusObject;
-    bool m_lastKeyDead;
-    bool m_sendKeyEvent;
+    Qt::KeyboardModifiers m_currentWheelModifiers;
     bool m_dontOverrideCtrlLMB;
     bool m_sendUpAsRightButton;
-    Qt::KeyboardModifiers m_currentWheelModifiers;
-    NSString *m_inputSource;
-    QNSViewMouseMoveHelper *m_mouseMoveHelper;
-    bool m_resendKeyEvent;
     bool m_scrolling;
     bool m_updatingDrag;
+
+    // Keys
+    bool m_lastKeyDead;
+    bool m_sendKeyEvent;
+    bool m_resendKeyEvent;
     NSEvent *m_currentlyInterpretedKeyEvent;
     QSet<quint32> m_acceptedKeyDowns;
+
+    // Text
+    NSString *m_inputSource;
+    QString m_composingText;
+    QPointer<QObject> m_composingFocusObject;
 }
 
 - (instancetype)initWithCocoaWindow:(QCocoaWindow *)platformWindow
 {
     if ((self = [super initWithFrame:NSZeroRect])) {
         m_platformWindow = platformWindow;
-        m_lastKeyDead = false;
-        m_sendKeyEvent = false;
-        m_inputSource = nil;
-        m_resendKeyEvent = false;
-        m_updatingDrag = false;
-        m_currentlyInterpretedKeyEvent = nil;
 
         self.focusRingType = NSFocusRingTypeNone;
 
@@ -158,6 +158,15 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
         [self initDrawing];
         [self initMouse];
         [self registerDragTypes];
+
+        m_updatingDrag = false;
+
+        m_lastKeyDead = false;
+        m_sendKeyEvent = false;
+        m_resendKeyEvent = false;
+        m_currentlyInterpretedKeyEvent = nil;
+
+        m_inputSource = nil;
     }
     return self;
 }
-- 
cgit v1.2.3