Further cleanup for consistency

sources/AdvancedWorkingDirectoryWindowController.h

@@ -14,6 +14,6 @@
 @property(nonatomic, copy) Profile *profile;
 // An array of keys that may be changed in self.profile. All take string values.
-@property (readonly) NSArray<NSString*> *allKeys;
+@property(nonatomic, readonly) NSArray<NSString *> *allKeys;
 @end

sources/ColorsMenuItemView.m

@@ -56,8 +56,13 @@ enum {
     kMenuItemGray = 7
 };
+- (void)dealloc {
+    [_color release];
+    [super dealloc];
+}
+
 // Returns the color gradient corresponding to the color index.
-// These colours were chosen to appear similar to those in Aperture 3.
+// These colors were chosen to appear similar to those in Aperture 3.
 // Based on http://cocoatricks.com/2010/07/a-label-color-picker-menu-item-2/
 - (NSGradient *)gradientForColorIndex:(NSInteger)colorIndex {

sources/ContextMenuActionPrefsController.h

@@ -27,8 +27,7 @@ typedef NS_ENUM(NSInteger, ContextMenuActions) {
 @interface ContextMenuActionPrefsController : NSWindowController <
-
-NSWindowDelegate, NSTableViewDelegate, NSTableViewDataSource>
+    NSWindowDelegate, NSTableViewDelegate, NSTableViewDataSource>
 @property (nonatomic, assign) id<ContextMenuActionPrefsDelegate> delegate;
 @property (nonatomic, assign) BOOL hasSelection;

sources/Coprocess.h

@@ -8,23 +8,17 @@
 #import <Cocoa/Cocoa.h>
-@interface Coprocess : NSObject {
-    pid_t pid_;  // -1 after termination
-    int outputFd_;
-    int inputFd_;
-    NSMutableData *outputBuffer_;
-    NSMutableData *inputBuffer_;
-    BOOL eof_;
-    BOOL mute_;
-}
-
-@property (nonatomic, assign) pid_t pid;
-@property (nonatomic, assign) int outputFd;  // for writing
-@property (nonatomic, assign) int inputFd;  // for reading
-@property (nonatomic, readonly) NSMutableData *outputBuffer;
-@property (nonatomic, readonly) NSMutableData *inputBuffer;
-@property (nonatomic, assign) BOOL eof;
-@property (nonatomic, assign) BOOL mute;
+@interface Coprocess : NSObject
+
+@property(nonatomic, assign) pid_t pid;  // -1 after termination
+@property(nonatomic, assign) int outputFd;  // for writing
+@property(nonatomic, assign) int inputFd;  // for reading
+@property(nonatomic, readonly) NSMutableData *outputBuffer;
+@property(nonatomic, readonly) NSMutableData *inputBuffer;
+@property(nonatomic, assign) BOOL eof;
+@property(nonatomic, assign) BOOL mute;
+@property(nonatomic, readonly) int readFileDescriptor;  // for reading
+@property(nonatomic, readonly) int writeFileDescriptor;  // for writing
 + (Coprocess *)launchedCoprocessWithCommand:(NSString *)command;
@@ -44,7 +38,5 @@
 - (BOOL)wantToWrite;
 - (void)mainProcessDidTerminate;
 - (void)terminate;
-@property(nonatomic, readonly) int readFileDescriptor;  // for reading
-@property(nonatomic, readonly) int writeFileDescriptor;  // for writing
 @end

sources/Coprocess.m

@@ -14,10 +14,10 @@ const int kMaxOutputBufferSize = 1024;
 static NSString *kCoprocessMruKey = @"Coprocess MRU";
 @implementation Coprocess {
-  // When this is set, writing is no longer an option (probably because the
-  // coprocess terminated).  This is different than eof_, which indicates that
-  // reading is no longer an option and the coprocess is well and truly dead.
-  BOOL writePipeClosed_;
+    // When this is set, writing is no longer an option (probably because the
+    // coprocess terminated).  This is different than eof_, which indicates that
+    // reading is no longer an option and the coprocess is well and truly dead.
+    BOOL writePipeClosed_;
 }
 @synthesize pid = pid_;

sources/EquivalenceClassSet.h

@@ -2,7 +2,7 @@
 @interface EquivalenceClassSet : NSObject 
-@property (nonatomic, readonly) NSArray<Class> *classes;
+@property(nonatomic, readonly) NSArray<Class> *classes;
 - (NSArray *)valuesEqualTo:(NSObject<NSCopying> *)target;
 - (void)setValue:(NSObject<NSCopying> *)value equalToValue:(NSObject<NSCopying> *)otherValue;

sources/IntervalMap.h

@@ -26,7 +26,6 @@
 @interface IntervalMap : NSObject 
-- (instancetype)init;
 - (void)setObject:(id)object forRange:(IntRange *)range;
 - (void)incrementNumbersBy:(int)amount inRange:(IntRange *)range;
 - (NSArray *)allValues;

sources/IntervalTree.h

@@ -7,11 +7,11 @@
 // Negative locations have special meaning. Don't use them.
 @property(nonatomic, assign) long long location;
 @property(nonatomic, assign) long long length;
+@property(nonatomic, readonly) long long limit;
 + (instancetype)intervalWithLocation:(long long)location length:(long long)length;
 + (Interval *)maxInterval;
 // One more than the largest value in the interval.
-@property(nonatomic, readonly) long long limit;
 - (BOOL)intersects:(Interval *)other;
 - (BOOL)isEqualToInterval:(Interval *)interval;
@@ -50,10 +50,7 @@
 @end
-@interface IntervalTree : NSObject <AATreeDelegate> {
-    AATree *_tree;
-    int _count;
-}
+@interface IntervalTree : NSObject <AATreeDelegate>
 @property(nonatomic, readonly) NSInteger count;
 @property(nonatomic, readonly) NSString *debugString;

sources/IntervalTree.m

@@ -307,7 +307,10 @@ static NSString *const kIntervalLengthKey = @"Length";
 @end
-@implementation IntervalTree
+@implementation IntervalTree {
+    AATree *_tree;
+    int _count;
+}
 - (instancetype)initWithDictionary:(NSDictionary *)dict {
     self = [self init];

sources/MovingAverage.h

@@ -15,9 +15,9 @@
     NSTimeInterval _timePaused;  // Time at which -pauseTimer was called.
 }
-@property (nonatomic, assign) double alpha;  // Initialized to 0.5. Small values make updates affect the moving average more.
-@property (nonatomic, assign) double value;
-@property (nonatomic, readonly) NSTimeInterval timeSinceTimerStarted;
+@property(nonatomic, assign) double alpha;  // Initialized to 0.5. Small values make updates affect the moving average more.
+@property(nonatomic, assign) double value;
+@property(nonatomic, readonly) NSTimeInterval timeSinceTimerStarted;
 - (void)startTimer;
 - (void)pauseTimer;

sources/PointerController.h

@@ -41,8 +41,8 @@
 @interface PointerController : NSObject
-@property (nonatomic, assign) id<PointerControllerDelegate> delegate;
-@property (nonatomic, readonly) BOOL viewShouldTrackTouches;
+@property(nonatomic, assign) id<PointerControllerDelegate> delegate;
+@property(nonatomic, readonly) BOOL viewShouldTrackTouches;
 - (BOOL)mouseDown:(NSEvent *)event withTouches:(int)numTouches ignoreOption:(BOOL)ignoreOption;
 - (BOOL)mouseUp:(NSEvent *)event withTouches:(int)numTouches;

sources/SCPFile.m

@@ -44,7 +44,7 @@ static NSError *SCPFileError(NSString *description) {
     NSString *_hostName;
 }
-- (id)init {
+- (instancetype)init {
     self = [super init];
     if (self) {
         _queue = dispatch_queue_create("com.googlecode.iterm2.SCPFile", NULL);

sources/TmuxControllerRegistry.h

@@ -12,10 +12,10 @@
 extern NSString *const kTmuxControllerRegistryDidChange;
-@interface TmuxControllerRegistry : NSObject 
-@property (readonly) NSInteger numberOfClients;
-@property (readonly, copy) NSArray<NSString*> *clientNames;
+@interface TmuxControllerRegistry : NSObject
+@property(nonatomic, readonly) NSInteger numberOfClients;
+@property(nonatomic, readonly) NSArray<NSString*> *clientNames;
 + (instancetype)sharedInstance;
 - (TmuxController *)controllerForClient:(NSString *)client;

sources/TmuxGateway.m

@@ -41,8 +41,6 @@ static NSString *kCommandIsLastInList = @"lastInList";
     // set.
     BOOL disconnected_;
-    id<TmuxGatewayDelegate> delegate_;  // weak
-
     // Data from parsing an incoming command
     ControlCommand command_;

sources/TmuxWindowsTable.h

@@ -26,7 +26,7 @@ extern NSString *kWindowPasteboardType;
 @end
-@interface TmuxWindowsTable : NSObject <NSTableViewDelegate, NSTableViewDataSource> 
+@interface TmuxWindowsTable : NSObject <NSTableViewDelegate, NSTableViewDataSource>
 @property (nonatomic, assign) id<TmuxWindowsTableProtocol> delegate;

sources/iTermApplicationDelegate.h

@@ -53,8 +53,8 @@ int DebugLogImpl(const char *file, int line, const char *function, NSString* val
 // Is Sparkle in the process of restarting us?
 @property(nonatomic, readonly) BOOL sparkleRestarting;
-@property (readonly) BOOL useBackgroundPatternIndicator;
-@property (readonly) BOOL warnBeforeMultiLinePaste;
+@property(nonatomic, readonly) BOOL useBackgroundPatternIndicator;
+@property(nonatomic, readonly) BOOL warnBeforeMultiLinePaste;
 - (void)awakeFromNib;

sources/iTermExposeView.h

@@ -15,14 +15,14 @@
 @interface iTermExposeView : NSView <GlobalSearchDelegate>
-@property (nonatomic, assign) iTermExposeGridView *grid;
-@property (readonly) NSRect searchFrame;
-- (instancetype)initWithFrame:(NSRect)frameRect;
-- (iTermExposeTabView*)resultView;
-- (PTYSession*)resultSession;
+@property(nonatomic, assign) iTermExposeGridView *grid;
+@property(nonatomic, readonly) NSRect searchFrame;
+- (iTermExposeTabView *)resultView;
+- (PTYSession *)resultSession;
 #pragma mark GlobalSearchDelegate
+
 - (void)globalSearchSelectionChangedToSession:(PTYSession*)theSession;
 - (void)globalSearchOpenSelection;
 - (void)globalSearchViewDidResize:(NSRect)origSize;

sources/iTermObjectPool.h

@@ -56,10 +56,10 @@
 @interface iTermObjectPool : NSObject
+@property(nonatomic, readonly) iTermPooledObject *pooledObject;
+
 - (instancetype)initWithClass:(Class)theClass
         collections:(int)numCollections
       objectsPerCollection:(int)objectsPerCollection;
-@property(nonatomic, readonly) iTermPooledObject *pooledObject;
-
 @end

sources/iTermSemanticHistoryPrefsController.h

@@ -35,9 +35,9 @@ extern NSString *kSemanticHistoryCoprocessAction;
 @interface iTermSemanticHistoryPrefsController : NSObject
-@property (nonatomic, copy) NSString *guid;
-@property (nonatomic, assign) IBOutlet id<iTermSemanticHistoryPrefsControllerDelegate> delegate;
-@property (readonly) NSDictionary *prefs;
+@property(nonatomic, copy) NSString *guid;
+@property(nonatomic, assign) IBOutlet id<iTermSemanticHistoryPrefsControllerDelegate> delegate;
+@property(nonatomic, readonly) NSDictionary *prefs;
 + (NSString *)bestEditor;
 + (NSString *)schemeForEditor:(NSString *)editor;

sources/iTermToolWrapper.h

@@ -56,10 +56,10 @@
 @interface iTermToolWrapper : NSView
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, readonly) __weak NSView *container;
-@property (nonatomic, assign) id<ToolWrapperDelegate> delegate;
-@property (nonatomic, readonly) id<ToolbeltTool> tool;
+@property(nonatomic, copy) NSString *name;
+@property(nonatomic, readonly) __weak NSView *container;
+@property(nonatomic, assign) id<ToolWrapperDelegate> delegate;
+@property(nonatomic, readonly) id<ToolbeltTool> tool;
 - (void)relayout;
 - (void)removeToolSubviews;