From 540f9e9e76475f0fcbe6db05978fe4a257610609 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Fri, 17 Jul 2015 17:28:05 -0700 Subject: [PATCH] Remove unnecessary whitespace and an unused header --- .../HelloWorld.xcodeproj/project.pbxproj | 2 - .../helloworld/HelloWorld/AppDelegate.h | 3 -- .../helloworld/HelloWorld/AppDelegate.m | 1 - .../helloworld/HelloWorld/ViewController.h | 40 ------------------- .../helloworld/HelloWorld/ViewController.m | 6 ++- 5 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 objective-c/helloworld/HelloWorld/ViewController.h diff --git a/objective-c/helloworld/HelloWorld.xcodeproj/project.pbxproj b/objective-c/helloworld/HelloWorld.xcodeproj/project.pbxproj index 04b0968784d..702ad3ff8b2 100644 --- a/objective-c/helloworld/HelloWorld.xcodeproj/project.pbxproj +++ b/objective-c/helloworld/HelloWorld.xcodeproj/project.pbxproj @@ -22,7 +22,6 @@ 5E3690651B2A23800040F884 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 5E3690671B2A23800040F884 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 5E3690681B2A23800040F884 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 5E36906A1B2A23800040F884 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; 5E36906B1B2A23800040F884 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; 5E36906E1B2A23800040F884 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 5E3690701B2A23800040F884 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; @@ -75,7 +74,6 @@ 5E3690701B2A23800040F884 /* Images.xcassets */, 5E36906D1B2A23800040F884 /* Main.storyboard */, 5E36906B1B2A23800040F884 /* ViewController.m */, - 5E36906A1B2A23800040F884 /* ViewController.h */, 5E3690681B2A23800040F884 /* AppDelegate.m */, 5E3690671B2A23800040F884 /* AppDelegate.h */, 5E3690641B2A23800040F884 /* Info.plist */, diff --git a/objective-c/helloworld/HelloWorld/AppDelegate.h b/objective-c/helloworld/HelloWorld/AppDelegate.h index b1857f28e08..102e7f3adea 100644 --- a/objective-c/helloworld/HelloWorld/AppDelegate.h +++ b/objective-c/helloworld/HelloWorld/AppDelegate.h @@ -34,8 +34,5 @@ #import @interface AppDelegate : UIResponder - @property (strong, nonatomic) UIWindow *window; - @end - diff --git a/objective-c/helloworld/HelloWorld/AppDelegate.m b/objective-c/helloworld/HelloWorld/AppDelegate.m index 27b1f00f989..a38e36651ed 100644 --- a/objective-c/helloworld/HelloWorld/AppDelegate.m +++ b/objective-c/helloworld/HelloWorld/AppDelegate.m @@ -34,5 +34,4 @@ #import "AppDelegate.h" @implementation AppDelegate - @end diff --git a/objective-c/helloworld/HelloWorld/ViewController.h b/objective-c/helloworld/HelloWorld/ViewController.h deleted file mode 100644 index 38cd7f92b66..00000000000 --- a/objective-c/helloworld/HelloWorld/ViewController.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * - * Copyright 2015, Google Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/objective-c/helloworld/HelloWorld/ViewController.m b/objective-c/helloworld/HelloWorld/ViewController.m index 91df435ed92..090fd936892 100644 --- a/objective-c/helloworld/HelloWorld/ViewController.m +++ b/objective-c/helloworld/HelloWorld/ViewController.m @@ -31,8 +31,10 @@ * */ -#import "ViewController.h" +#import -@implementation ViewController +@interface ViewController : UIViewController +@end +@implementation ViewController @end