Permalink
Browse files

Changed to postfix under bar standard.

Changed member variables to the postfix underbar standard.  Added
internal "required" interface definitions for some methods.
  • Loading branch information...
1 parent d4ce095 commit cff6306e71e36b3af85d1722b4fc9f009209703d @epreston committed Oct 3, 2011
@@ -12,8 +12,8 @@
@class PSHTreeGraphViewController;
@interface PSHTreeGraphAppDelegate : NSObject <UIApplicationDelegate> {
- UIWindow *window;
- PSHTreeGraphViewController *viewController;
+ UIWindow *window_;
+ PSHTreeGraphViewController *viewController_;
}
@property (nonatomic, retain) IBOutlet UIWindow *window;
@@ -14,17 +14,17 @@
@implementation PSHTreeGraphAppDelegate
-@synthesize window;
-@synthesize viewController;
+@synthesize window = window_;
+@synthesize viewController = viewController_;
#pragma mark - Application Lifecycle
- (BOOL) application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
// Override point for customization after app launch.
- [window addSubview:viewController.view];
- [window makeKeyAndVisible];
+ [window_ addSubview:viewController_.view];
+ [window_ makeKeyAndVisible];
return YES;
}
@@ -62,8 +62,8 @@ - (void) applicationDidReceiveMemoryWarning:(UIApplication *)application
- (void) dealloc
{
- [viewController release];
- [window release];
+ [viewController_ release];
+ [window_ release];
[super dealloc];
}
@@ -13,9 +13,12 @@
@class PSBaseTreeGraphView;
-@interface PSHTreeGraphViewController : UIViewController <PSTreeGraphDelegate> {
- PSBaseTreeGraphView *treeGraphView;
- NSString *rootClassName;
+@interface PSHTreeGraphViewController : UIViewController <PSTreeGraphDelegate>
+{
+
+@private
+ PSBaseTreeGraphView *treeGraphView_;
+ NSString *rootClassName_;
}
// The TreeGraph
@@ -20,20 +20,19 @@ @implementation PSHTreeGraphViewController
#pragma mark - Property Accessors
-@synthesize treeGraphView;
-
-@synthesize rootClassName;
+@synthesize treeGraphView = treeGraphView_;
+@synthesize rootClassName = rootClassName_;
- (void) setRootClassName:(NSString *)newRootClassName
{
NSParameterAssert(newRootClassName != nil);
- if (![rootClassName isEqualToString:newRootClassName]) {
- [rootClassName release];
- rootClassName = [newRootClassName copy];
+ if (![rootClassName_ isEqualToString:newRootClassName]) {
+ [rootClassName_ release];
+ rootClassName_ = [newRootClassName copy];
// Get an ObjCClassWrapper for the named Objective-C Class, and set it as the TreeGraph's root.
- [treeGraphView setModelRoot:[ObjCClassWrapper wrapperForClassNamed:rootClassName]];
+ [treeGraphView_ setModelRoot:[ObjCClassWrapper wrapperForClassNamed:rootClassName_]];
}
}
@@ -46,10 +45,10 @@ - (void) viewDidLoad
[super viewDidLoad];
// Set the delegate to self.
- [treeGraphView setDelegate:self];
+ [self.treeGraphView setDelegate:self];
// Specify a .nib file for the TreeGraph to load each time it needs to create a new node view.
- [treeGraphView setNodeViewNibName:@"ObjCClassTreeNodeView"];
+ [self.treeGraphView setNodeViewNibName:@"ObjCClassTreeNodeView"];
// Specify a starting root class to inspect on launch.
[self setRootClassName:@"UIControl"];
@@ -66,7 +65,7 @@ - (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)inter
duration:(NSTimeInterval)duration
{
// Keep the view in sync
- [treeGraphView parentClipViewDidResize:nil];
+ [self.treeGraphView parentClipViewDidResize:nil];
}
@@ -112,7 +111,7 @@ - (void) viewDidUnload
- (void) dealloc
{
- [rootClassName release];
+ [rootClassName_ release];
[super dealloc];
}
@@ -17,9 +17,9 @@
@private
// Interface
- UIButton *expandButton;
- UILabel *titleLabel;
- UILabel *detailLabel;
+ UIButton *expandButton_;
+ UILabel *titleLabel_;
+ UILabel *detailLabel_;
}
@property (nonatomic, assign) IBOutlet UIButton *expandButton;
@@ -12,7 +12,9 @@
@implementation PSHLeafView
-@synthesize expandButton, titleLabel, detailLabel;
+@synthesize expandButton = expandButton_;
+@synthesize titleLabel = titleLabel_;
+@synthesize detailLabel = detailLabel_;
- (id) initWithFrame:(CGRect)frame
{
@@ -2,20 +2,15 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">800</int>
- <string key="IBDocument.SystemVersion">11A511</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
+ <string key="IBDocument.SystemVersion">11B26</string>
+ <string key="IBDocument.InterfaceBuilderVersion">907</string>
<string key="IBDocument.AppKitVersion">1138</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">534</string>
+ <string key="NS.object.0">141</string>
</object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBUIWindow</string>
- <string>IBUICustomObject</string>
- <string>IBUIViewController</string>
- <string>IBProxyObject</string>
- </array>
+ <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
@@ -30,12 +25,9 @@
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIWindow" id="62075450">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{768, 1024}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -55,7 +47,6 @@
<string key="IBUINibName">PSHTreeGraphViewController</string>
<reference key="IBUISimulatedStatusBarMetrics" ref="456458906"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -215,7 +206,8 @@
<integer value="800" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <nil key="IBDocument.LastKnownRelativeProjectPath"/>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">534</string>
+ <string key="IBCocoaTouchPluginVersion">141</string>
</data>
</archive>
@@ -3,19 +3,14 @@
<data>
<int key="IBDocument.SystemTarget">800</int>
<string key="IBDocument.SystemVersion">11B26</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
+ <string key="IBDocument.InterfaceBuilderVersion">907</string>
<string key="IBDocument.AppKitVersion">1138</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">534</string>
+ <string key="NS.object.0">141</string>
</object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBUIButton</string>
- <string>IBUIView</string>
- <string>IBUILabel</string>
- <string>IBProxyObject</string>
- </array>
+ <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
@@ -30,15 +25,14 @@
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="246752469">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{191, 10}, {29, 31}}</string>
+ <string key="NSFrame">{{191, 8}, {29, 31}}</string>
<reference key="NSSuperview" ref="191373211"/>
- <reference key="NSWindow"/>
<int key="IBUIContentMode">4</int>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -71,7 +65,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{9, 7}, {169, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="298809504"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -97,8 +90,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{9, 23}, {169, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="246752469"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -117,12 +108,9 @@
</object>
</array>
<string key="NSFrameSize">{229, 48}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="189980015"/>
<reference key="IBUIBackgroundColor" ref="202185770"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="IBUIInterfaceOrientation">3</int>
<int key="interfaceOrientation">3</int>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -235,89 +223,22 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">19</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <object class="IBPartialClassDescription">
- <string key="className">PSBaseLeafView</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/PSBaseLeafView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">PSBaseSubtreeView</string>
- <string key="superclassName">UIView</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">toggleExpansion:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">toggleExpansion:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">toggleExpansion:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">nodeView</string>
- <string key="NS.object.0">UIView</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">nodeView</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">nodeView</string>
- <string key="candidateClassName">UIView</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/PSBaseSubtreeView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">PSHLeafView</string>
- <string key="superclassName">PSBaseLeafView</string>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="detailLabel">UILabel</string>
- <string key="expandButton">UIButton</string>
- <string key="titleLabel">UILabel</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="detailLabel">
- <string key="name">detailLabel</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo" key="expandButton">
- <string key="name">expandButton</string>
- <string key="candidateClassName">UIButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="titleLabel">
- <string key="name">titleLabel</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/PSHLeafView.h</string>
- </object>
- </object>
- </array>
+ <int key="maxID">21</int>
</object>
+ <object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="800" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <nil key="IBDocument.LastKnownRelativeProjectPath"/>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">TreeViewSubtreeExpandedButton.png</string>
<string key="NS.object.0">{15, 17}</string>
</object>
- <string key="IBCocoaTouchPluginVersion">534</string>
+ <string key="IBCocoaTouchPluginVersion">141</string>
</data>
</archive>
Oops, something went wrong.

0 comments on commit cff6306

Please sign in to comment.