From f2d875705ec3c2417a0c58c64db91e10f63e0e5a Mon Sep 17 00:00:00 2001 From: David Catmull Date: Fri, 3 Jun 2011 16:41:50 -0600 Subject: [PATCH] rename again to accommodate implicit nib naming --- GitX.xcodeproj/project.pbxproj | 12 ++++++------ ...ashViewController.h => PBStashContentController.h | 4 ++-- ...ashViewController.m => PBStashContentController.m | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) rename PBStashViewController.h => PBStashContentController.h (86%) rename PBStashViewController.m => PBStashContentController.m (69%) diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index fc0c36e..0617280 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -138,7 +138,7 @@ D8FDDA6F114335E8005647F6 /* PBGitSVStageItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D8FDDA67114335E8005647F6 /* PBGitSVStageItem.m */; }; D8FDDA70114335E8005647F6 /* PBGitSVTagItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D8FDDA69114335E8005647F6 /* PBGitSVTagItem.m */; }; D8FDDBF41143F318005647F6 /* AddRemote.png in Resources */ = {isa = PBXBuildFile; fileRef = D8FDDBF31143F318005647F6 /* AddRemote.png */; }; - DDB8FE0113998CE2001A9EE2 /* PBStashViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DDB8FE0013998CE2001A9EE2 /* PBStashViewController.m */; }; + DDB8FE0113998CE2001A9EE2 /* PBStashContentController.m in Sources */ = {isa = PBXBuildFile; fileRef = DDB8FE0013998CE2001A9EE2 /* PBStashContentController.m */; }; F50FE0E30E07BE9600854FCD /* PBGitRevisionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F50FE0E20E07BE9600854FCD /* PBGitRevisionCell.m */; }; F513085B0E0740F2000C8BCD /* PBQLOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = F513085A0E0740F2000C8BCD /* PBQLOutlineView.m */; }; F5140DC90E8A8EB20091E9F3 /* RoundedRectangle.m in Sources */ = {isa = PBXBuildFile; fileRef = F5140DC80E8A8EB20091E9F3 /* RoundedRectangle.m */; }; @@ -426,8 +426,8 @@ D8FDDA69114335E8005647F6 /* PBGitSVTagItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitSVTagItem.m; sourceTree = ""; }; D8FDDA7311433634005647F6 /* PBSourceViewItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBSourceViewItems.h; sourceTree = ""; }; D8FDDBF31143F318005647F6 /* AddRemote.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AddRemote.png; path = Images/AddRemote.png; sourceTree = ""; }; - DDB8FDFF13998CE2001A9EE2 /* PBStashViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBStashViewController.h; sourceTree = ""; }; - DDB8FE0013998CE2001A9EE2 /* PBStashViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBStashViewController.m; sourceTree = ""; }; + DDB8FDFF13998CE2001A9EE2 /* PBStashContentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBStashContentController.h; sourceTree = ""; }; + DDB8FE0013998CE2001A9EE2 /* PBStashContentController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBStashContentController.m; sourceTree = ""; }; F50FE0E10E07BE9600854FCD /* PBGitRevisionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRevisionCell.h; sourceTree = ""; }; F50FE0E20E07BE9600854FCD /* PBGitRevisionCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRevisionCell.m; sourceTree = ""; }; F51308590E0740F2000C8BCD /* PBQLOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBQLOutlineView.h; sourceTree = ""; }; @@ -942,8 +942,8 @@ 77C8280C06725ACE000B614F /* ApplicationController.m */, 93CB42C00EAB7B2200530609 /* PBGitDefaults.h */, 93CB42C10EAB7B2200530609 /* PBGitDefaults.m */, - DDB8FDFF13998CE2001A9EE2 /* PBStashViewController.h */, - DDB8FE0013998CE2001A9EE2 /* PBStashViewController.m */, + DDB8FDFF13998CE2001A9EE2 /* PBStashContentController.h */, + DDB8FE0013998CE2001A9EE2 /* PBStashContentController.m */, F57CC43F0E05E496000472E2 /* PBGitWindowController.h */, F57CC4400E05E496000472E2 /* PBGitWindowController.m */, 911111F60E594F3F00BF76B4 /* PBRepositoryDocumentController.h */, @@ -1452,7 +1452,7 @@ 217FF0BE12A1CB3E00785A65 /* PBRevealWithFinderCommand.m in Sources */, 65D58BC7132D48C2003F7290 /* PBResetSheet.m in Sources */, 31776089133569350025876E /* SearchWebView.m in Sources */, - DDB8FE0113998CE2001A9EE2 /* PBStashViewController.m in Sources */, + DDB8FE0113998CE2001A9EE2 /* PBStashContentController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/PBStashViewController.h b/PBStashContentController.h similarity index 86% rename from PBStashViewController.h rename to PBStashContentController.h index ca8b334..f048bac 100644 --- a/PBStashViewController.h +++ b/PBStashContentController.h @@ -1,5 +1,5 @@ // -// PBStashViewController.h +// PBStashContentController.h // GitX // // Created by David Catmull on 20-06-11. @@ -13,7 +13,7 @@ @class PBWebStashController; // Controls the view displaying a stash diff -@interface PBStashViewController : PBViewController { +@interface PBStashContentController : PBViewController { IBOutlet id webView; IBOutlet PBWebStashController *webController; } diff --git a/PBStashViewController.m b/PBStashContentController.m similarity index 69% rename from PBStashViewController.m rename to PBStashContentController.m index e29b746..b2a7a11 100644 --- a/PBStashViewController.m +++ b/PBStashContentController.m @@ -1,15 +1,15 @@ // -// PBStashViewController.h +// PBStashContentController.h // GitX // // Created by David Catmull on 20-06-11. // Copyright 2011. All rights reserved. // -#import "PBStashViewController.h" +#import "PBStashContentController.h" #import "PBGitStash.h" -@implementation PBStashViewController +@implementation PBStashContentController - (void) awakeFromNib {