From ac1910ab4b54c4b4ef012d3373ed66ac7ea77f00 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Thu, 8 Mar 2018 10:46:29 +0100
Subject: Clean up our Objective-C usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following ba871065e0f40e9197fa4ee0ffe76530bb6fca11 in qtbase.

- Move ivars into @implementation
- Use instancetype where applicable

Change-Id: I33be9b380e3bea6bd54be1d0bfd7e3e7072fc82a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/gamepads/darwin/qdarwingamepadbackend.mm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm b/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm
index 1298c00..5c07271 100644
--- a/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm
+++ b/src/plugins/gamepads/darwin/qdarwingamepadbackend.mm
@@ -40,23 +40,21 @@
 #import <GameController/GameController.h>
 
 @interface QT_MANGLE_NAMESPACE(DarwinGamepadManager) : NSObject
-{
-    QDarwinGamepadBackend *backend;
-    NSMutableArray *connectedControllers;
-}
 
 @property (nonatomic, strong) id connectObserver;
 @property (nonatomic, strong) id disconnectObserver;
 
--(void)addMonitoredController:(GCController *)controller;
--(void)removeMonitoredController:(GCController *)controller;
-
 @end
 
 @implementation QT_MANGLE_NAMESPACE(DarwinGamepadManager)
+{
+    QDarwinGamepadBackend *backend;
+    NSMutableArray *connectedControllers;
+}
 
--(id)initWithBackend:(QDarwinGamepadBackend *)gamepadBackend {
-    if (self = [super init]) {
+-(instancetype)initWithBackend:(QDarwinGamepadBackend *)gamepadBackend
+{
+    if ((self = [self init])) {
         backend = gamepadBackend;
         connectedControllers = [[NSMutableArray alloc] init];
         //Setup observers for monitoring controller connections/disconnections
-- 
cgit v1.2.3