@@ -71,15 +71,13 @@ #endif OF_DIRECT_MEMBERS @interface OFApplication () - (instancetype)of_init OF_METHOD_FAMILY(init); -- (void)of_setArgumentCount: (int *)argc - andArgumentValues: (char **[])argv; +- (void)of_setArgumentCount: (int *)argc andArgumentValues: (char **[])argv; #ifdef OF_WINDOWS -- (void)of_setArgumentCount: (int)argc - andWideArgumentValues: (wchar_t *[])argv; +- (void)of_setArgumentCount: (int)argc andWideArgumentValues: (wchar_t *[])argv; #endif - (void)of_run; @end static OFApplication *app = nil; @@ -114,16 +112,14 @@ app = [[OFApplication alloc] of_init]; #ifdef OF_WINDOWS if ([OFSystemInfo isWindowsNT]) { __wgetmainargs(&wargc, &wargv, &wenvp, _CRT_glob, &si); - [app of_setArgumentCount: wargc - andWideArgumentValues: wargv]; + [app of_setArgumentCount: wargc andWideArgumentValues: wargv]; } else #endif - [app of_setArgumentCount: argc - andArgumentValues: argv]; + [app of_setArgumentCount: argc andArgumentValues: argv]; app.delegate = delegate; [app of_run]; @@ -329,12 +325,11 @@ path = [@"ENV:" stringByAppendingString: name]; if ([fileManager directoryExistsAtPath: path]) continue; - file = [OFFile fileWithPath: path - mode: @"r"]; + file = [OFFile fileWithPath: path mode: @"r"]; value = [file readLineWithEncoding: encoding]; if (value != nil) [_environment setObject: value forKey: name]; @@ -467,12 +462,11 @@ [_environment release]; [super dealloc]; } -- (void)of_setArgumentCount: (int *)argc - andArgumentValues: (char ***)argv +- (void)of_setArgumentCount: (int *)argc andArgumentValues: (char ***)argv { void *pool = objc_autoreleasePoolPush(); OFMutableArray *arguments; of_string_encoding_t encoding; @@ -501,12 +495,11 @@ objc_autoreleasePoolPop(pool); } #ifdef OF_WINDOWS -- (void)of_setArgumentCount: (int)argc - andWideArgumentValues: (wchar_t **)argv +- (void)of_setArgumentCount: (int)argc andWideArgumentValues: (wchar_t **)argv { void *pool = objc_autoreleasePoolPush(); OFMutableArray *arguments; if (argc > 0) { @@ -523,12 +516,11 @@ objc_autoreleasePoolPop(pool); } #endif -- (void)getArgumentCount: (int **)argc - andArgumentValues: (char ****)argv +- (void)getArgumentCount: (int **)argc andArgumentValues: (char ****)argv { *argc = _argc; *argv = _argv; }