Format almost everything.
This CL was generated by running git ls-files | grep -P "(\.h|\.cc)$" | grep -v 'sdk/' | grep -v 'rtc_base/ssl_' | \ grep -v 'fake_rtc_certificate_generator.h' | grep -v 'modules/audio_device/win/' | \ grep -v 'system_wrappers/source/clock.cc' | grep -v 'rtc_base/trace_event.h' | \ grep -v 'modules/audio_coding/codecs/ilbc/' | grep -v 'screen_capturer_mac.h' | \ grep -v 'spl_inl_mips.h' | grep -v 'data_size_unittest.cc' | grep -v 'timestamp_unittest.cc' \ | xargs clang-format -i ; git cl format Most of these changes are clang-format grouping and reordering includes differently. Bug: webrtc:9340 Change-Id: Ic83ddbc169bfacd21883e381b5181c3dd4fe8a63 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144051 Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28505}
This commit is contained in:
@ -10,5 +10,5 @@
|
||||
|
||||
#import "ARDRoomServerClient.h"
|
||||
|
||||
@interface ARDAppEngineClient : NSObject<ARDRoomServerClient>
|
||||
@interface ARDAppEngineClient : NSObject <ARDRoomServerClient>
|
||||
@end
|
||||
|
||||
@ -13,5 +13,5 @@
|
||||
// The main application class of the AppRTCMobile iOS app demonstrating
|
||||
// interoperability between the Objective C implementation of PeerConnection
|
||||
// and the appr.tc demo webapp.
|
||||
@interface ARDAppDelegate : NSObject<UIApplicationDelegate>
|
||||
@interface ARDAppDelegate : NSObject <UIApplicationDelegate>
|
||||
@end
|
||||
|
||||
@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
- (instancetype)initWithStyle:(UITableViewStyle)style NS_UNAVAILABLE;
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
+ (instancetype) new NS_UNAVAILABLE;
|
||||
+ (instancetype)new NS_UNAVAILABLE;
|
||||
|
||||
@end
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@ -17,8 +17,7 @@
|
||||
@protocol ARDExternalSampleDelegate;
|
||||
|
||||
API_AVAILABLE(ios(10.0))
|
||||
@interface ARDBroadcastSampleHandler
|
||||
: RPBroadcastSampleHandler<ARDAppClientDelegate>
|
||||
@interface ARDBroadcastSampleHandler : RPBroadcastSampleHandler <ARDAppClientDelegate>
|
||||
|
||||
@property(nonatomic, strong) id<ARDExternalSampleDelegate> capturer;
|
||||
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
API_AVAILABLE(ios(11.0))
|
||||
@interface ARDBroadcastSetupViewController
|
||||
: UIViewController<UITextFieldDelegate>
|
||||
@interface ARDBroadcastSetupViewController : UIViewController <UITextFieldDelegate>
|
||||
|
||||
@end
|
||||
|
||||
@ -10,5 +10,5 @@
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
@interface APPRTCAppDelegate : NSObject<NSApplicationDelegate>
|
||||
@interface APPRTCAppDelegate : NSObject <NSApplicationDelegate>
|
||||
@end
|
||||
|
||||
@ -18,23 +18,23 @@
|
||||
#import <Security/SecCertificate.h>
|
||||
|
||||
typedef enum {
|
||||
SR_CONNECTING = 0,
|
||||
SR_OPEN = 1,
|
||||
SR_CLOSING = 2,
|
||||
SR_CLOSED = 3,
|
||||
SR_CONNECTING = 0,
|
||||
SR_OPEN = 1,
|
||||
SR_CLOSING = 2,
|
||||
SR_CLOSED = 3,
|
||||
} SRReadyState;
|
||||
|
||||
typedef enum SRStatusCode : NSInteger {
|
||||
SRStatusCodeNormal = 1000,
|
||||
SRStatusCodeGoingAway = 1001,
|
||||
SRStatusCodeProtocolError = 1002,
|
||||
SRStatusCodeUnhandledType = 1003,
|
||||
// 1004 reserved.
|
||||
SRStatusNoStatusReceived = 1005,
|
||||
// 1004-1006 reserved.
|
||||
SRStatusCodeInvalidUTF8 = 1007,
|
||||
SRStatusCodePolicyViolated = 1008,
|
||||
SRStatusCodeMessageTooBig = 1009,
|
||||
SRStatusCodeNormal = 1000,
|
||||
SRStatusCodeGoingAway = 1001,
|
||||
SRStatusCodeProtocolError = 1002,
|
||||
SRStatusCodeUnhandledType = 1003,
|
||||
// 1004 reserved.
|
||||
SRStatusNoStatusReceived = 1005,
|
||||
// 1004-1006 reserved.
|
||||
SRStatusCodeInvalidUTF8 = 1007,
|
||||
SRStatusCodePolicyViolated = 1008,
|
||||
SRStatusCodeMessageTooBig = 1009,
|
||||
} SRStatusCode;
|
||||
|
||||
@class SRWebSocket;
|
||||
@ -50,14 +50,14 @@ extern NSString *const SRHTTPResponseErrorKey;
|
||||
|
||||
@interface SRWebSocket : NSObject <NSStreamDelegate>
|
||||
|
||||
@property (nonatomic, weak) id <SRWebSocketDelegate> delegate;
|
||||
@property(nonatomic, weak) id<SRWebSocketDelegate> delegate;
|
||||
|
||||
@property (nonatomic, readonly) SRReadyState readyState;
|
||||
@property (nonatomic, readonly, retain) NSURL *url;
|
||||
@property(nonatomic, readonly) SRReadyState readyState;
|
||||
@property(nonatomic, readonly, retain) NSURL *url;
|
||||
|
||||
// This returns the negotiated protocol.
|
||||
// It will be nil until after the handshake completes.
|
||||
@property (nonatomic, readonly, copy) NSString *protocol;
|
||||
@property(nonatomic, readonly, copy) NSString *protocol;
|
||||
|
||||
// Protocols should be an array of strings that turn into Sec-WebSocket-Protocol.
|
||||
- (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols;
|
||||
@ -69,8 +69,8 @@ extern NSString *const SRHTTPResponseErrorKey;
|
||||
|
||||
// Delegate queue will be dispatch_main_queue by default.
|
||||
// You cannot set both OperationQueue and dispatch_queue.
|
||||
- (void)setDelegateOperationQueue:(NSOperationQueue*) queue;
|
||||
- (void)setDelegateDispatchQueue:(dispatch_queue_t) queue;
|
||||
- (void)setDelegateOperationQueue:(NSOperationQueue *)queue;
|
||||
- (void)setDelegateDispatchQueue:(dispatch_queue_t)queue;
|
||||
|
||||
// By default, it will schedule itself on +[NSRunLoop SR_networkRunLoop] using defaultModes.
|
||||
- (void)scheduleInRunLoop:(NSRunLoop *)aRunLoop forMode:(NSString *)mode;
|
||||
@ -102,7 +102,10 @@ extern NSString *const SRHTTPResponseErrorKey;
|
||||
|
||||
- (void)webSocketDidOpen:(SRWebSocket *)webSocket;
|
||||
- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error;
|
||||
- (void)webSocket:(SRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean;
|
||||
- (void)webSocket:(SRWebSocket *)webSocket
|
||||
didCloseWithCode:(NSInteger)code
|
||||
reason:(NSString *)reason
|
||||
wasClean:(BOOL)wasClean;
|
||||
- (void)webSocket:(SRWebSocket *)webSocket didReceivePong:(NSData *)pongPayload;
|
||||
|
||||
@end
|
||||
@ -111,7 +114,7 @@ extern NSString *const SRHTTPResponseErrorKey;
|
||||
|
||||
@interface NSURLRequest (CertificateAdditions)
|
||||
|
||||
@property (nonatomic, retain, readonly) NSArray *SR_SSLPinnedCertificates;
|
||||
@property(nonatomic, retain, readonly) NSArray *SR_SSLPinnedCertificates;
|
||||
|
||||
@end
|
||||
|
||||
@ -119,7 +122,7 @@ extern NSString *const SRHTTPResponseErrorKey;
|
||||
|
||||
@interface NSMutableURLRequest (CertificateAdditions)
|
||||
|
||||
@property (nonatomic, retain) NSArray *SR_SSLPinnedCertificates;
|
||||
@property(nonatomic, retain) NSArray *SR_SSLPinnedCertificates;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user