From 9ca93a8b8e811881a3c5fe31b854b873e3e5b500 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Tue, 29 Oct 2013 00:14:15 +0000 Subject: [PATCH] Explicitly @synthesize ObjC @properties This is required after https://code.google.com/p/gyp/source/detail?r=1768 turned on -Wobjc-missing-property-synthesis for ninja builds (until then it was only enabled for xcode builds) to allow chromium_deps to roll in webrtc/DEPS. BUG=2560 R=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/3089004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5047 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/objc/RTCICECandidate.mm | 10 +++++----- talk/app/webrtc/objc/RTCICEServer.mm | 4 ++++ talk/app/webrtc/objc/RTCPair.m | 3 +++ talk/app/webrtc/objc/RTCPeerConnectionFactory.mm | 2 ++ talk/app/webrtc/objc/RTCSessionDescription.mm | 8 ++++---- talk/app/webrtc/objc/RTCVideoRenderer.mm | 2 ++ .../objctests/RTCSessionDescriptionSyncObserver.m | 6 ++++++ talk/examples/ios/AppRTCDemo/APPRTCAppClient.m | 13 +++++++++++++ talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m | 8 ++++++++ talk/examples/ios/AppRTCDemo/APPRTCViewController.m | 4 ++++ talk/examples/ios/AppRTCDemo/GAEChannelClient.m | 3 +++ 11 files changed, 54 insertions(+), 9 deletions(-) diff --git a/talk/app/webrtc/objc/RTCICECandidate.mm b/talk/app/webrtc/objc/RTCICECandidate.mm index a6d793549..07a29ee45 100644 --- a/talk/app/webrtc/objc/RTCICECandidate.mm +++ b/talk/app/webrtc/objc/RTCICECandidate.mm @@ -31,11 +31,11 @@ #import "RTCICECandidate+internal.h" -@implementation RTCICECandidate { - NSString *_sdpMid; - NSInteger _sdpMLineIndex; - NSString *_sdp; -} +@implementation RTCICECandidate + +@synthesize sdpMid = _sdpMid; +@synthesize sdpMLineIndex = _sdpMLineIndex; +@synthesize sdp = _sdp; - (id)initWithMid:(NSString *)sdpMid index:(NSInteger)sdpMLineIndex diff --git a/talk/app/webrtc/objc/RTCICEServer.mm b/talk/app/webrtc/objc/RTCICEServer.mm index cc5a84a41..f01ed3235 100644 --- a/talk/app/webrtc/objc/RTCICEServer.mm +++ b/talk/app/webrtc/objc/RTCICEServer.mm @@ -33,6 +33,10 @@ @implementation RTCICEServer +@synthesize URI = _URI; +@synthesize username = _username; +@synthesize password = _password; + - (id)initWithURI:(NSURL *)URI username:(NSString *)username password:(NSString *)password { diff --git a/talk/app/webrtc/objc/RTCPair.m b/talk/app/webrtc/objc/RTCPair.m index ee2ba1b1e..31ac53ac1 100644 --- a/talk/app/webrtc/objc/RTCPair.m +++ b/talk/app/webrtc/objc/RTCPair.m @@ -29,6 +29,9 @@ @implementation RTCPair +@synthesize key = _key; +@synthesize value = _value; + - (id)initWithKey:(NSString *)key value:(NSString *)value { if ((self = [super init])) { _key = [key copy]; diff --git a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm index 1c6e7e7bc..325110fb3 100644 --- a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm +++ b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm @@ -64,6 +64,8 @@ @implementation RTCPeerConnectionFactory +@synthesize nativeFactory = _nativeFactory; + + (void)initializeSSL { BOOL initialized = talk_base::InitializeSSL(); NSAssert(initialized, @"Failed to initialize SSL library"); diff --git a/talk/app/webrtc/objc/RTCSessionDescription.mm b/talk/app/webrtc/objc/RTCSessionDescription.mm index 4bd9b1447..dd2bbdc14 100644 --- a/talk/app/webrtc/objc/RTCSessionDescription.mm +++ b/talk/app/webrtc/objc/RTCSessionDescription.mm @@ -31,10 +31,10 @@ #import "RTCSessionDescription+internal.h" -@implementation RTCSessionDescription { - NSString *_description; - NSString *_type; -} +@implementation RTCSessionDescription + +@synthesize description = _description; +@synthesize type = _type; - (id)initWithType:(NSString *)type sdp:(NSString *)sdp { if (!type || !sdp) { diff --git a/talk/app/webrtc/objc/RTCVideoRenderer.mm b/talk/app/webrtc/objc/RTCVideoRenderer.mm index 3d3b10e2b..231361521 100644 --- a/talk/app/webrtc/objc/RTCVideoRenderer.mm +++ b/talk/app/webrtc/objc/RTCVideoRenderer.mm @@ -40,6 +40,8 @@ @implementation RTCVideoRenderer +@synthesize delegate = _delegate; + + (RTCVideoRenderer *)videoRenderGUIWithFrame:(CGRect)frame { // TODO (hughv): Implement. return nil; diff --git a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m index c04c1c39c..85a4482b8 100644 --- a/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m +++ b/talk/app/webrtc/objctests/RTCSessionDescriptionSyncObserver.m @@ -44,6 +44,12 @@ @implementation RTCSessionDescriptionSyncObserver +@synthesize error = _error; +@synthesize sessionDescription = _sessionDescription; +@synthesize success = _success; +@synthesize condition = _condition; +@synthesize signaled = _signaled; + - (id)init { if ((self = [super init])) { if (!(_condition = [[NSCondition alloc] init])) diff --git a/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m b/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m index 99f516666..d6c86d842 100644 --- a/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m +++ b/talk/examples/ios/AppRTCDemo/APPRTCAppClient.m @@ -49,6 +49,19 @@ @implementation APPRTCAppClient +@synthesize ICEServerDelegate = _ICEServerDelegate; +@synthesize messageHandler = _messageHandler; + +@synthesize backgroundQueue = _backgroundQueue; +@synthesize baseURL = _baseURL; +@synthesize gaeChannel = _gaeChannel; +@synthesize postMessageUrl = _postMessageUrl; +@synthesize pcConfig = _pcConfig; +@synthesize roomHtml = _roomHtml; +@synthesize sendQueue = _sendQueue; +@synthesize token = _token; +@synthesize verboseLogging = _verboseLogging; + - (id)init { if (self = [super init]) { _backgroundQueue = dispatch_queue_create("RTCBackgroundQueue", NULL); diff --git a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m index 34aa7520c..65cdd0979 100644 --- a/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m +++ b/talk/examples/ios/AppRTCDemo/APPRTCAppDelegate.m @@ -142,6 +142,14 @@ @implementation APPRTCAppDelegate +@synthesize window = _window; +@synthesize viewController = _viewController; +@synthesize client = _client; +@synthesize pcObserver = _pcObserver; +@synthesize peerConnection = _peerConnection; +@synthesize peerConnectionFactory = _peerConnectionFactory; +@synthesize queuedRemoteCandidates = _queuedRemoteCandidates; + #pragma mark - UIApplicationDelegate methods - (BOOL)application:(UIApplication *)application diff --git a/talk/examples/ios/AppRTCDemo/APPRTCViewController.m b/talk/examples/ios/AppRTCDemo/APPRTCViewController.m index ab84c0932..bd346efcd 100644 --- a/talk/examples/ios/AppRTCDemo/APPRTCViewController.m +++ b/talk/examples/ios/AppRTCDemo/APPRTCViewController.m @@ -33,6 +33,10 @@ @implementation APPRTCViewController +@synthesize textField = _textField; +@synthesize textInstructions = _textInstructions; +@synthesize textOutput = _textOutput; + - (void)viewDidLoad { [super viewDidLoad]; self.textField.delegate = self; diff --git a/talk/examples/ios/AppRTCDemo/GAEChannelClient.m b/talk/examples/ios/AppRTCDemo/GAEChannelClient.m index 9126f67c7..e0d9a8076 100644 --- a/talk/examples/ios/AppRTCDemo/GAEChannelClient.m +++ b/talk/examples/ios/AppRTCDemo/GAEChannelClient.m @@ -38,6 +38,9 @@ @implementation GAEChannelClient +@synthesize delegate = _delegate; +@synthesize webView = _webView; + - (id)initWithToken:(NSString *)token delegate:(id)delegate { self = [super init]; if (self) {