iOS: Clean up style in Objective-C message signatures

- Space between class/instance signifier
 - No space between return type and message name
 - No space in message arguments

Change-Id: Ie25e0be3c134586c44bb82bf7075f6eb153388a9
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
This commit is contained in:
Tor Arne Vestbø 2015-05-22 14:43:39 +02:00
parent 66050f2ac8
commit 5926d7422e
12 changed files with 48 additions and 48 deletions

View File

@ -43,7 +43,7 @@
@implementation QIOSApplicationStateListener @implementation QIOSApplicationStateListener
- (id) init - (id)init
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
@ -75,7 +75,7 @@
return self; return self;
} }
- (void) dealloc - (void)dealloc
{ {
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
removeObserver:self removeObserver:self
@ -92,12 +92,12 @@
[super dealloc]; [super dealloc];
} }
- (void) applicationDidBecomeActive - (void)applicationDidBecomeActive
{ {
[self handleApplicationStateChanged:UIApplicationStateActive]; [self handleApplicationStateChanged:UIApplicationStateActive];
} }
- (void) applicationWillResignActive - (void)applicationWillResignActive
{ {
// Note that UIApplication is still UIApplicationStateActive at this // Note that UIApplication is still UIApplicationStateActive at this
// point, but since there is no separate notification for the inactive // point, but since there is no separate notification for the inactive
@ -105,12 +105,12 @@
[self handleApplicationStateChanged:UIApplicationStateInactive]; [self handleApplicationStateChanged:UIApplicationStateInactive];
} }
- (void) applicationDidEnterBackground - (void)applicationDidEnterBackground
{ {
[self handleApplicationStateChanged:UIApplicationStateBackground]; [self handleApplicationStateChanged:UIApplicationStateBackground];
} }
- (void) handleApplicationStateChanged:(UIApplicationState) uiApplicationState - (void)handleApplicationStateChanged:(UIApplicationState)uiApplicationState
{ {
// We may receive application state changes after QCoreApplication has // We may receive application state changes after QCoreApplication has
// gone down, as the block we schedule on the main queue keeps the // gone down, as the block we schedule on the main queue keeps the

View File

@ -62,7 +62,7 @@
@implementation QUIClipboard @implementation QUIClipboard
-(id)initWithQIOSClipboard:(QIOSClipboard *)qiosClipboard - (id)initWithQIOSClipboard:(QIOSClipboard *)qiosClipboard
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
@ -87,7 +87,7 @@
return self; return self;
} }
-(void)dealloc - (void)dealloc
{ {
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
removeObserver:self removeObserver:self

View File

@ -293,7 +293,7 @@ static bool rootLevelRunLoopIntegration()
@implementation QIOSApplicationStateTracker @implementation QIOSApplicationStateTracker
+ (void) load + (void)load
{ {
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
addObserver:self addObserver:self
@ -323,7 +323,7 @@ static bool rootLevelRunLoopIntegration()
# error "Unknown processor family" # error "Unknown processor family"
#endif #endif
+ (void) applicationDidFinishLaunching + (void)applicationDidFinishLaunching
{ {
if (!isQtApplication()) if (!isQtApplication())
return; return;
@ -377,7 +377,7 @@ static bool rootLevelRunLoopIntegration()
// four bits of the exit code (exit(3) will only pass on the lower 8 bits). // four bits of the exit code (exit(3) will only pass on the lower 8 bits).
static const char kApplicationWillTerminateExitCode = SIGTERM | 0x80; static const char kApplicationWillTerminateExitCode = SIGTERM | 0x80;
+ (void) applicationWillTerminate + (void)applicationWillTerminate
{ {
if (!isQtApplication()) if (!isQtApplication())
return; return;

View File

@ -68,7 +68,7 @@ int infoPlistValue(NSString* key, int defaultValue);
QT_END_NAMESPACE QT_END_NAMESPACE
@interface UIResponder (QtFirstResponder) @interface UIResponder (QtFirstResponder)
+(id)currentFirstResponder; + (id)currentFirstResponder;
@end @end
class FirstResponderCandidate : public QScopedValueRollback<UIResponder *> class FirstResponderCandidate : public QScopedValueRollback<UIResponder *>

View File

@ -133,7 +133,7 @@ int infoPlistValue(NSString* key, int defaultValue)
@end @end
@implementation QtFirstResponderEvent @implementation QtFirstResponderEvent
- (void) dealloc - (void)dealloc
{ {
self.firstResponder = 0; self.firstResponder = 0;
[super dealloc]; [super dealloc];
@ -158,7 +158,7 @@ int infoPlistValue(NSString* key, int defaultValue)
@implementation UIResponder (QtFirstResponder) @implementation UIResponder (QtFirstResponder)
+(id)currentFirstResponder + (id)currentFirstResponder
{ {
QtFirstResponderEvent *event = [[[QtFirstResponderEvent alloc] init] autorelease]; QtFirstResponderEvent *event = [[[QtFirstResponderEvent alloc] init] autorelease];
[[UIApplication sharedApplication] sendAction:@selector(qt_findFirstResponder:event:) to:nil from:nil forEvent:event]; [[UIApplication sharedApplication] sendAction:@selector(qt_findFirstResponder:event:) to:nil from:nil forEvent:event];

View File

@ -165,7 +165,7 @@ static NSString *const kSelectorPrefix = @"_qtMenuItem_";
[self reloadAllComponents]; [self reloadAllComponents];
} }
-(void)listenForKeyboardWillHideNotification:(BOOL)listen - (void)listenForKeyboardWillHideNotification:(BOOL)listen
{ {
if (listen) { if (listen) {
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
@ -179,7 +179,7 @@ static NSString *const kSelectorPrefix = @"_qtMenuItem_";
} }
} }
-(void)dealloc - (void)dealloc
{ {
[self listenForKeyboardWillHideNotification:NO]; [self listenForKeyboardWillHideNotification:NO];
self.toolbar = 0; self.toolbar = 0;

View File

@ -104,12 +104,12 @@ static QIOSScreen* qtPlatformScreenFor(UIScreen *uiScreen)
@public @public
QIOSScreen *m_screen; QIOSScreen *m_screen;
} }
- (id) initWithQIOSScreen:(QIOSScreen *)screen; - (id)initWithQIOSScreen:(QIOSScreen *)screen;
@end @end
@implementation QIOSOrientationListener @implementation QIOSOrientationListener
- (id) initWithQIOSScreen:(QIOSScreen *)screen - (id)initWithQIOSScreen:(QIOSScreen *)screen
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
@ -123,7 +123,7 @@ static QIOSScreen* qtPlatformScreenFor(UIScreen *uiScreen)
return self; return self;
} }
- (void) dealloc - (void)dealloc
{ {
[[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications]; [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
@ -132,7 +132,7 @@ static QIOSScreen* qtPlatformScreenFor(UIScreen *uiScreen)
[super dealloc]; [super dealloc];
} }
- (void) orientationChanged:(NSNotification *)notification - (void)orientationChanged:(NSNotification *)notification
{ {
Q_UNUSED(notification); Q_UNUSED(notification);
m_screen->updateProperties(); m_screen->updateProperties();

View File

@ -92,12 +92,12 @@
return [QUITextPosition positionWithIndex:(self.range.location + self.range.length)]; return [QUITextPosition positionWithIndex:(self.range.location + self.range.length)];
} }
- (NSRange) range - (NSRange)range
{ {
return _range; return _range;
} }
-(BOOL)isEmpty - (BOOL)isEmpty
{ {
return (self.range.length == 0); return (self.range.length == 0);
} }
@ -111,7 +111,7 @@
@implementation WrapperView @implementation WrapperView
-(id)initWithView:(UIView *)view - (id)initWithView:(UIView *)view
{ {
if (self = [self init]) { if (self = [self init]) {
[self addSubview:view]; [self addSubview:view];
@ -143,7 +143,7 @@
// retained, we ensure that all messages sent to the view during // retained, we ensure that all messages sent to the view during
// its lifetime in a window hierarcy will be able to traverse the // its lifetime in a window hierarcy will be able to traverse the
// responder chain. // responder chain.
-(void)willMoveToWindow:(UIWindow *)window - (void)willMoveToWindow:(UIWindow *)window
{ {
if (window) if (window)
[[self nextResponder] retain]; [[self nextResponder] retain];
@ -383,17 +383,17 @@
return m_inputContext->imeState().currentState.value(query); return m_inputContext->imeState().currentState.value(query);
} }
-(id<UITextInputTokenizer>)tokenizer - (id<UITextInputTokenizer>)tokenizer
{ {
return [[[UITextInputStringTokenizer alloc] initWithTextInput:id<UITextInput>(self)] autorelease]; return [[[UITextInputStringTokenizer alloc] initWithTextInput:id<UITextInput>(self)] autorelease];
} }
-(UITextPosition *)beginningOfDocument - (UITextPosition *)beginningOfDocument
{ {
return [QUITextPosition positionWithIndex:0]; return [QUITextPosition positionWithIndex:0];
} }
-(UITextPosition *)endOfDocument - (UITextPosition *)endOfDocument
{ {
int endPosition = [self currentImeState:Qt::ImSurroundingText].toString().length(); int endPosition = [self currentImeState:Qt::ImSurroundingText].toString().length();
return [QUITextPosition positionWithIndex:endPosition]; return [QUITextPosition positionWithIndex:endPosition];
@ -659,7 +659,7 @@
return [NSDictionary dictionaryWithObject:uifont forKey:UITextInputTextFontKey]; return [NSDictionary dictionaryWithObject:uifont forKey:UITextInputTextFontKey];
} }
-(NSDictionary *)markedTextStyle - (NSDictionary *)markedTextStyle
{ {
return [NSDictionary dictionary]; return [NSDictionary dictionary];
} }

View File

@ -288,13 +288,13 @@
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
-(BOOL)shouldAutorotate - (BOOL)shouldAutorotate
{ {
return m_screen && m_screen->uiScreen() == [UIScreen mainScreen] && !self.lockedOrientation; return m_screen && m_screen->uiScreen() == [UIScreen mainScreen] && !self.lockedOrientation;
} }
#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_6_0) #if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_6_0)
-(NSUInteger)supportedInterfaceOrientations - (NSUInteger)supportedInterfaceOrientations
{ {
// As documented by Apple in the iOS 6.0 release notes, setStatusBarOrientation:animated: // As documented by Apple in the iOS 6.0 release notes, setStatusBarOrientation:animated:
// only works if the supportedInterfaceOrientations of the view controller is 0, making // only works if the supportedInterfaceOrientations of the view controller is 0, making
@ -307,7 +307,7 @@
#endif #endif
#if QT_IOS_DEPLOYMENT_TARGET_BELOW(__IPHONE_6_0) #if QT_IOS_DEPLOYMENT_TARGET_BELOW(__IPHONE_6_0)
-(BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{ {
Q_UNUSED(interfaceOrientation); Q_UNUSED(interfaceOrientation);
return [self shouldAutorotate]; return [self shouldAutorotate];

View File

@ -42,8 +42,8 @@
@property (readonly) QAccessible::Id axid; @property (readonly) QAccessible::Id axid;
- (id) initWithId: (QAccessible::Id) anId withAccessibilityContainer: (id) view; - (id)initWithId:(QAccessible::Id)anId withAccessibilityContainer:(id)view;
+ (QMacAccessibilityElement *) elementWithId: (QAccessible::Id) anId withAccessibilityContainer: (id) view; + (QMacAccessibilityElement *)elementWithId:(QAccessible::Id)anId withAccessibilityContainer:(id)view;
@end @end

View File

@ -37,7 +37,7 @@
@implementation QMacAccessibilityElement @implementation QMacAccessibilityElement
- (id) initWithId: (QAccessible::Id) anId withAccessibilityContainer: (id) view - (id)initWithId:(QAccessible::Id)anId withAccessibilityContainer:(id)view
{ {
Q_ASSERT((int)anId < 0); Q_ASSERT((int)anId < 0);
self = [super initWithAccessibilityContainer: view]; self = [super initWithAccessibilityContainer: view];
@ -47,7 +47,7 @@
return self; return self;
} }
+ (id) elementWithId: (QAccessible::Id) anId withAccessibilityContainer: (id) view + (id)elementWithId:(QAccessible::Id)anId withAccessibilityContainer:(id)view
{ {
Q_ASSERT(anId); Q_ASSERT(anId);
if (!anId) if (!anId)
@ -64,17 +64,17 @@
return element; return element;
} }
- (void) invalidate - (void)invalidate
{ {
[self release]; [self release];
} }
- (BOOL) isAccessibilityElement - (BOOL)isAccessibilityElement
{ {
return YES; return YES;
} }
- (NSString*) accessibilityLabel - (NSString*)accessibilityLabel
{ {
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) { if (!iface) {
@ -85,7 +85,7 @@
return iface->text(QAccessible::Name).toNSString(); return iface->text(QAccessible::Name).toNSString();
} }
- (NSString*) accessibilityHint - (NSString*)accessibilityHint
{ {
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) { if (!iface) {
@ -95,7 +95,7 @@
return iface->text(QAccessible::Description).toNSString(); return iface->text(QAccessible::Description).toNSString();
} }
- (NSString*) accessibilityValue - (NSString*)accessibilityValue
{ {
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) { if (!iface) {
@ -119,7 +119,7 @@
return [super accessibilityHint]; return [super accessibilityHint];
} }
- (CGRect) accessibilityFrame - (CGRect)accessibilityFrame
{ {
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) { if (!iface) {
@ -131,7 +131,7 @@
return CGRectMake(rect.x(), rect.y(), rect.width(), rect.height()); return CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
} }
- (UIAccessibilityTraits) accessibilityTraits - (UIAccessibilityTraits)accessibilityTraits
{ {
UIAccessibilityTraits traits = UIAccessibilityTraitNone; UIAccessibilityTraits traits = UIAccessibilityTraitNone;
@ -156,7 +156,7 @@
return traits; return traits;
} }
- (BOOL) accessibilityActivate - (BOOL)accessibilityActivate
{ {
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (QAccessibleActionInterface *action = iface->actionInterface()) { if (QAccessibleActionInterface *action = iface->actionInterface()) {
@ -171,21 +171,21 @@
return NO; // fall back to sending mouse clicks return NO; // fall back to sending mouse clicks
} }
- (void) accessibilityIncrement - (void)accessibilityIncrement
{ {
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (QAccessibleActionInterface *action = iface->actionInterface()) if (QAccessibleActionInterface *action = iface->actionInterface())
action->doAction(QAccessibleActionInterface::increaseAction()); action->doAction(QAccessibleActionInterface::increaseAction());
} }
- (void) accessibilityDecrement - (void)accessibilityDecrement
{ {
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (QAccessibleActionInterface *action = iface->actionInterface()) if (QAccessibleActionInterface *action = iface->actionInterface())
action->doAction(QAccessibleActionInterface::decreaseAction()); action->doAction(QAccessibleActionInterface::decreaseAction());
} }
- (BOOL) accessibilityScroll : (UIAccessibilityScrollDirection) direction - (BOOL)accessibilityScroll:(UIAccessibilityScrollDirection)direction
{ {
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
QAccessibleActionInterface *action = iface->actionInterface(); QAccessibleActionInterface *action = iface->actionInterface();

View File

@ -50,7 +50,7 @@
return [CAEAGLLayer class]; return [CAEAGLLayer class];
} }
-(id)initWithQIOSWindow:(QIOSWindow *)window - (id)initWithQIOSWindow:(QIOSWindow *)window
{ {
if (self = [self initWithFrame:toCGRect(window->geometry())]) if (self = [self initWithFrame:toCGRect(window->geometry())])
m_qioswindow = window; m_qioswindow = window;
@ -310,7 +310,7 @@
} }
} }
- (void) sendTouchEventWithTimestamp:(ulong)timeStamp - (void)sendTouchEventWithTimestamp:(ulong)timeStamp
{ {
// Send touch event synchronously // Send touch event synchronously
QIOSIntegration *iosIntegration = QIOSIntegration::instance(); QIOSIntegration *iosIntegration = QIOSIntegration::instance();