Clean up our Objective-C usage

- Move ivars into @implementation
- Use instancetype where applicable
- Use dot notation for property access
- Use subscript operator for dictionaries and arrays
- Format selectors consistently
- Use proper style for init methods
- Use generics instead of void pointers where possible
- Use "range for" loops instead of indexing
- Replace or replace IBAction/IBOutlet with void

Change-Id: I1667812a51d4dfe44ae80fe337cb1f4bc9699d92
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 17 insertions, 19 deletions

diff --git a/src/plugins/platforms/ios/qiosviewcontroller.mm b/src/plugins/platforms/ios/qiosviewcontroller.mm
index a7663b9e94..787c6b8409 100644
--- a/src/plugins/platforms/ios/qiosviewcontroller.mm
+++ b/src/plugins/platforms/ios/qiosviewcontroller.mm
@@ -56,12 +56,8 @@
 
 // -------------------------------------------------------------------------
 
-@interface QIOSViewController () {
-  @public
-    QPointer<QT_PREPEND_NAMESPACE(QIOSScreen)> m_screen;
-    BOOL m_updatingProperties;
-    QMetaObject::Connection m_focusWindowChangeConnection;
-}
+@interface QIOSViewController ()
+@property (nonatomic, assign) QPointer<QT_PREPEND_NAMESPACE(QIOSScreen)> platformScreen;
 @property (nonatomic, assign) BOOL changingOrientation;
 @end
 
@@ -72,7 +68,7 @@
 
 @implementation QIOSDesktopManagerView
 
-- (id)init
+- (instancetype)init
 {
     if (!(self = [super init]))
         return nil;
@@ -125,7 +121,7 @@
 {
     Q_UNUSED(subview);
 
-    QT_PREPEND_NAMESPACE(QIOSScreen) *screen = self.qtViewController->m_screen;
+    QT_PREPEND_NAMESPACE(QIOSScreen) *screen = self.qtViewController.platformScreen;
 
     // The 'window' property of our view is not valid until the window
     // has been shown, so we have to access it through the QIOSScreen.
@@ -170,7 +166,7 @@
         // here. iOS will still use the latest rendered frame to create the
         // application switcher thumbnail, but it will be based on the last
         // active orientation of the application.
-        QIOSScreen *screen = self.qtViewController->m_screen;
+        QIOSScreen *screen = self.qtViewController.platformScreen;
         qCDebug(lcQpaWindow) << "ignoring layout of subviews while suspended,"
             << "likely system snapshot of" << screen->screen()->primaryOrientation();
         return;
@@ -246,7 +242,10 @@
 
 // -------------------------------------------------------------------------
 
-@implementation QIOSViewController
+@implementation QIOSViewController {
+    BOOL m_updatingProperties;
+    QMetaObject::Connection m_focusWindowChangeConnection;
+}
 
 #ifndef Q_OS_TVOS
 @synthesize prefersStatusBarHidden;
@@ -254,11 +253,10 @@
 @synthesize preferredStatusBarStyle;
 #endif
 
-- (id)initWithQIOSScreen:(QT_PREPEND_NAMESPACE(QIOSScreen) *)screen
+- (instancetype)initWithQIOSScreen:(QT_PREPEND_NAMESPACE(QIOSScreen) *)screen
 {
     if (self = [self init]) {
-        m_screen = screen;
-
+        self.platformScreen = screen;
 
         self.changingOrientation = NO;
 #ifndef Q_OS_TVOS
@@ -316,7 +314,7 @@
 - (BOOL)shouldAutorotate
 {
 #ifndef Q_OS_TVOS
-    return m_screen && m_screen->uiScreen() == [UIScreen mainScreen] && !self.lockedOrientation;
+    return self.platformScreen && self.platformScreen->uiScreen() == [UIScreen mainScreen] && !self.lockedOrientation;
 #else
     return NO;
 #endif
@@ -396,8 +394,8 @@
     if (!QCoreApplication::instance())
         return;
 
-    if (m_screen)
-        m_screen->updateProperties();
+    if (self.platformScreen)
+        self.platformScreen->updateProperties();
 }
 
 // -------------------------------------------------------------------------
@@ -407,12 +405,12 @@
     if (!isQtApplication())
         return;
 
-    if (!m_screen || !m_screen->screen())
+    if (!self.platformScreen || !self.platformScreen->screen())
         return;
 
     // For now we only care about the main screen, as both the statusbar
     // visibility and orientation is only appropriate for the main screen.
-    if (m_screen->uiScreen() != [UIScreen mainScreen])
+    if (self.platformScreen->uiScreen() != [UIScreen mainScreen])
         return;
 
     // Prevent recursion caused by updating the status bar appearance (position
@@ -434,7 +432,7 @@
         return;
 
     // We only care about changes to focusWindow that involves our screen
-    if (!focusWindow->screen() || focusWindow->screen()->handle() != m_screen)
+    if (!focusWindow->screen() || focusWindow->screen()->handle() != self.platformScreen)
         return;
 
     // All decisions are based on the the top level window