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>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/testlib/qxctestlogger.mm b/src/testlib/qxctestlogger.mm
index 62fd73070f..9fa9da2fdd 100644
--- a/src/testlib/qxctestlogger.mm
+++ b/src/testlib/qxctestlogger.mm
@@ -200,7 +200,7 @@ private:
     [autoreleasepool release];
 }
 
-+ (id)defaultTestSuite
++ (QTestLibTests *)defaultTestSuite
 {
     return [[QtTestLibTests alloc] initWithName:@"QtTestLib"];
 }
@@ -255,7 +255,7 @@ static XCTestSuiteRun *s_qtTestSuiteRun = 0;
 
 @implementation QtTestLibTest
 
-- (id)initWithInvocation:(NSInvocation *)invocation
+- (instancetype)initWithInvocation:(NSInvocation *)invocation
 {
     if (self = [super initWithInvocation:invocation]) {
         // The test object name and function name are used by XCTest after QtTestLib has
@@ -322,7 +322,7 @@ QXcodeTestLogger *QXcodeTestLogger::s_currentTestLogger = 0;
 
 QXcodeTestLogger::QXcodeTestLogger()
     : QAbstractTestLogger(0)
-    , m_testRuns([[NSMutableArray arrayWithCapacity:2] retain])
+    , m_testRuns([[NSMutableArray<XCTestRun *> arrayWithCapacity:2] retain])
 
 {
     Q_ASSERT(!s_currentTestLogger);
@@ -383,11 +383,11 @@ static bool isTestFunctionInActiveScope(const char *function)
 
     Q_ASSERT(activeScope == Selected);
 
-    static NSArray *forcedTests = [@[ @"initTestCase", @"initTestCase_data", @"cleanupTestCase" ] retain];
+    static NSArray<NSString *> *forcedTests = [@[ @"initTestCase", @"initTestCase_data", @"cleanupTestCase" ] retain];
     if ([forcedTests containsObject:[NSString stringWithUTF8String:function]])
         return true;
 
-    static NSArray *testsInScope = [[testScope componentsSeparatedByString:@","] retain];
+    static NSArray<NSString *> *testsInScope = [[testScope componentsSeparatedByString:@","] retain];
     bool inScope = [testsInScope containsObject:[NSString stringWithFormat:@"%s/%s",
                         QTestResult::currentTestObjectName(), function]];
 
diff --git a/src/testlib/qxctestlogger_p.h b/src/testlib/qxctestlogger_p.h
index 1b641f18af..8baa5aa27f 100644
--- a/src/testlib/qxctestlogger_p.h
+++ b/src/testlib/qxctestlogger_p.h
@@ -90,7 +90,7 @@ private:
     void pushTestRunForTest(XCTest *test, bool start);
     XCTestRun *popTestRun();
 
-    NSMutableArray *m_testRuns;
+    NSMutableArray<XCTestRun *> *m_testRuns;
 
     static QXcodeTestLogger *s_currentTestLogger;
 };