Move ivar declarations to their class extensions

This is really just to make the code style more similar to the TextMate source.

Author: rdwampler

CLIProxy.h

@@ -9,14 +9,6 @@
 #import "OptionParser.h"
 
 @interface CLIProxy : NSObject
-{
-	NSArray* _arguments;
-	NSDictionary* _parameters;
-
-	option_t const* optionTemplate;
-	size_t optionCount;
-	NSDictionary* parsedOptions;
-}
 @property (nonatomic, readonly) NSFileHandle* inputHandle;
 @property (nonatomic, readonly) NSFileHandle* outputHandle;
 @property (nonatomic, readonly) NSFileHandle* errorHandle;

CLIProxy.mm

@@ -9,6 +9,14 @@
 #import "TMDCommand.h"
 
 @interface CLIProxy ()
+{
+	NSArray* _arguments;
+	NSDictionary* _parameters;
+
+	option_t const* optionTemplate;
+	size_t optionCount;
+	NSDictionary* parsedOptions;
+}
 @property (nonatomic, readonly) NSArray* arguments;
 @end
 

Commands/nib/TMDNibController.h

@@ -4,11 +4,6 @@
 //
 
 @interface TMDNibController : NSObject <NSWindowDelegate>
-{
-	NSMutableArray* clientFileHandles;
-
-	NSWindow* window;
-}
 - (id)initWithNibPath:(NSString*)aPath;
 - (void)showWindowAndCenter:(BOOL)shouldCenter;
 

Commands/nib/TMDNibController.mm

@@ -37,6 +37,10 @@ - (BOOL)lionInstantiateWithOwner:(id)owner topLevelObjects:(NSArray**)topLevelOb
 @end
 
 @interface TMDNibController ()
+{
+	NSMutableArray* clientFileHandles;
+	NSWindow* window;
+}
 @property (nonatomic) NSArray* topLevelObjects;
 @property (nonatomic) NSMutableDictionary* parameters;
 @end

Commands/popup/TMDIncrementalPopUpMenu.h

@@ -10,20 +10,6 @@
 static NSUInteger const MAX_ROWS = 15;
 
 @interface TMDIncrementalPopUpMenu : NSWindow<NSTableViewDataSource>
-{
-	NSFileHandle* outputHandle;
-	NSArray* suggestions;
-	NSMutableString* mutablePrefix;
-	NSString* staticPrefix;
-	NSArray* filtered;
-	NSTableView* theTableView;
-	NSPoint caretPos;
-	BOOL isAbove;
-	BOOL closeMe;
-	BOOL caseSensitive;
-
-	NSMutableCharacterSet* textualInputCharacters;
-}
 - (id)initWithItems:(NSArray*)someSuggestions alreadyTyped:(NSString*)aUserString staticPrefix:(NSString*)aStaticPrefix additionalWordCharacters:(NSString*)someAdditionalWordCharacters caseSensitive:(BOOL)isCaseSensitive writeChoiceToFileDescriptor:(NSFileHandle*)aFileDescriptor;
 - (void)setCaretPos:(NSPoint)aPos;
 @end

Commands/popup/TMDIncrementalPopUpMenu.mm

@@ -48,6 +48,20 @@ - (BOOL)TMDcanHandleEvent:(NSEvent*)anEvent
 @end
 
 @interface TMDIncrementalPopUpMenu ()
+{
+	NSFileHandle* outputHandle;
+	NSArray* suggestions;
+	NSMutableString* mutablePrefix;
+	NSString* staticPrefix;
+	NSArray* filtered;
+	NSTableView* theTableView;
+	NSPoint caretPos;
+	BOOL isAbove;
+	BOOL closeMe;
+	BOOL caseSensitive;
+
+	NSMutableCharacterSet* textualInputCharacters;
+}
 - (NSRect)rectOfMainScreen;
 - (NSString*)filterString;
 - (void)setupInterface;

Commands/tooltip/TMDHTMLTips.h

@@ -8,12 +8,5 @@
 #import <WebKit/WebKit.h>
 
 @interface TMDHTMLTip : NSWindow
-{
-	WebView*	webView;
-	WebPreferences* webPreferences;
-
-	NSDate* didOpenAtDate; // ignore mouse moves for the next second
-	NSPoint mousePositionWhenOpened;
-}
 + (void)showWithContent:(NSString*)content atLocation:(NSPoint)point transparent:(BOOL)transparent;
 @end

Commands/tooltip/TMDHTMLTips.mm

@@ -15,6 +15,13 @@
 NSString* const TMDTooltipPreferencesIdentifier = @"TM Tooltip";
 
 @interface TMDHTMLTip ()
+{
+	WebView*	webView;
+	WebPreferences* webPreferences;
+
+	NSDate* didOpenAtDate; // ignore mouse moves for the next second
+	NSPoint mousePositionWhenOpened;
+}
 - (void)setContent:(NSString*)content transparent:(BOOL)transparent;
 - (void)runUntilUserActivity:(id)sender;
 @end