Reformat headers as well.

12 files changed, 169 insertions, 175 deletions

diff --git a/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h b/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h
index fd2c2dde4..9aa17a905 100644
--- a/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h
+++ b/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h
@@ -7,13 +7,12 @@
 //
 //	based on http://www.cocoadev.com/index.pl?GradientFill
 
-
 #import <Cocoa/Cocoa.h>
 
 @interface NSBezierPath (AMShading)
 
-- (void)customHorizontalFillWithCallbacks:(CGFunctionCallbacks) functionCallbacks firstColor:(NSColor *)firstColor secondColor:(NSColor *)secondColor;
-- (void)customVerticalFillWithCallbacks:(CGFunctionCallbacks) functionCallbacks firstColor:(NSColor *)firstColor secondColor:(NSColor *)secondColor;
+- (void)customHorizontalFillWithCallbacks:(CGFunctionCallbacks)functionCallbacks firstColor:(NSColor *)firstColor secondColor:(NSColor *)secondColor;
+- (void)customVerticalFillWithCallbacks:(CGFunctionCallbacks)functionCallbacks firstColor:(NSColor *)firstColor secondColor:(NSColor *)secondColor;
 
 - (void)linearGradientFillWithStartColor:(NSColor *)startColor endColor:(NSColor *)endColor;
 - (void)linearVerticalGradientFillWithStartColor:(NSColor *)startColor endColor:(NSColor *)endColor;
diff --git a/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h
index decda5be4..0c39f32e0 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h
@@ -8,14 +8,13 @@
 
 #import <Cocoa/Cocoa.h>
 
-
 @interface PSMOverflowPopUpButton : NSPopUpButton {
-	NSImage									*_PSMTabBarOverflowPopUpImage;
-	NSImage									*_PSMTabBarOverflowDownPopUpImage;
-	BOOL										_down;
-	BOOL										_animatingAlternateImage;
-	NSTimer									*_animationTimer;
-	CGFloat									_animationValue;
+    NSImage *_PSMTabBarOverflowPopUpImage;
+    NSImage *_PSMTabBarOverflowDownPopUpImage;
+    BOOL _down;
+    BOOL _animatingAlternateImage;
+    NSTimer *_animationTimer;
+    CGFloat _animationValue;
 }
 
 //alternate image display
diff --git a/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.h b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.h
index ffce06926..75c81d33c 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.h
@@ -8,7 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-
 @interface PSMProgressIndicator : NSProgressIndicator {
 }
 
diff --git a/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.h b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.h
index 62fce23e0..6f2afdb09 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.h
@@ -9,9 +9,9 @@
 #import <Cocoa/Cocoa.h>
 
 @interface PSMRolloverButton : NSButton {
-	NSImage									*_rolloverImage;
-	NSImage									*_usualImage;
-	NSTrackingRectTag							_myTrackingRectTag;
+    NSImage *_rolloverImage;
+    NSImage *_usualImage;
+    NSTrackingRectTag _myTrackingRectTag;
 }
 
 // the regular image
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.h
index c8f6cecdd..f5c51b495 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.h
@@ -10,34 +10,33 @@
 #import "PSMTabBarControl.h"
 #import "PSMProgressIndicator.h"
 
-
 @interface PSMTabBarCell : NSActionCell {
-	// sizing
-	NSRect									_frame;
-	NSSize									_stringSize;
-	NSInteger								_currentStep;
-	BOOL									_isPlaceholder;
-
-	// state
-	NSInteger								_tabState;
-	NSTrackingRectTag						_closeButtonTrackingTag;				// left side tracking, if dragging
-	NSTrackingRectTag						_cellTrackingTag;							// right side tracking, if dragging
-	BOOL									_closeButtonOver;
-	BOOL									_closeButtonPressed;
-	PSMProgressIndicator					*_indicator;
-	BOOL									_isInOverflowMenu;
-	BOOL									_hasCloseButton;
-	BOOL									_isCloseButtonSuppressed;
-	BOOL									_hasIcon;
-	BOOL									_hasLargeImage;
-	NSInteger								_count;
-	NSColor								*_countColor;
-	BOOL									_isEdited;
+    // sizing
+    NSRect _frame;
+    NSSize _stringSize;
+    NSInteger _currentStep;
+    BOOL _isPlaceholder;
+
+    // state
+    NSInteger _tabState;
+    NSTrackingRectTag _closeButtonTrackingTag; // left side tracking, if dragging
+    NSTrackingRectTag _cellTrackingTag; // right side tracking, if dragging
+    BOOL _closeButtonOver;
+    BOOL _closeButtonPressed;
+    PSMProgressIndicator *_indicator;
+    BOOL _isInOverflowMenu;
+    BOOL _hasCloseButton;
+    BOOL _isCloseButtonSuppressed;
+    BOOL _hasIcon;
+    BOOL _hasLargeImage;
+    NSInteger _count;
+    NSColor *_countColor;
+    BOOL _isEdited;
 }
 
 // creation/destruction
 - (id)initWithControlView:(PSMTabBarControl *)controlView;
-- (id)initPlaceholderWithFrame:(NSRect) frame expanded:(BOOL) value inControlView:(PSMTabBarControl *)controlView;
+- (id)initPlaceholderWithFrame:(NSRect)frame expanded:(BOOL)value inControlView:(PSMTabBarControl *)controlView;
 - (void)dealloc;
 
 // accessors
@@ -88,7 +87,7 @@
 - (CGFloat)desiredWidthOfCell;
 
 // drawing
-- (void)drawWithFrame:(NSRect) cellFrame inView:(NSView *)controlView;
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
 
 // tracking the mouse
 - (void)mouseEntered:(NSEvent *)theEvent;
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.h
index 980c43d38..26f11de7a 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.h
@@ -12,26 +12,26 @@
 
 #import <Cocoa/Cocoa.h>
 
-#define PSMTabDragDidEndNotification		@ "PSMTabDragDidEndNotification"
-#define PSMTabDragDidBeginNotification	@ "PSMTabDragDidBeginNotification"
+#define PSMTabDragDidEndNotification @"PSMTabDragDidEndNotification"
+#define PSMTabDragDidBeginNotification @"PSMTabDragDidBeginNotification"
 
-#define kPSMTabBarControlHeight			22
+#define kPSMTabBarControlHeight 22
 // internal cell border
-#define MARGIN_X								6
-#define MARGIN_Y								3
+#define MARGIN_X 6
+#define MARGIN_Y 3
 // padding between objects
-#define kPSMTabBarCellPadding				4
+#define kPSMTabBarCellPadding 4
 // fixed size objects
-#define kPSMMinimumTitleWidth				30
-#define kPSMTabBarIndicatorWidth			16.0
-#define kPSMTabBarIconWidth					16.0
-#define kPSMHideAnimationSteps				3.0
+#define kPSMMinimumTitleWidth 30
+#define kPSMTabBarIndicatorWidth 16.0
+#define kPSMTabBarIconWidth 16.0
+#define kPSMHideAnimationSteps 3.0
 
 // Value used in _currentStep to indicate that resizing operation is not in progress
-#define kPSMIsNotBeingResized				-1
+#define kPSMIsNotBeingResized -1
 
 // Value used in _currentStep when a resizing operation has just been started
-#define kPSMStartResizeAnimation			0
+#define kPSMStartResizeAnimation 0
 
 @class PSMOverflowPopUpButton;
 @class PSMRolloverButton;
@@ -40,82 +40,82 @@
 @protocol PSMTabStyle;
 
 typedef enum {
-	PSMTabBarHorizontalOrientation,
-	PSMTabBarVerticalOrientation
+    PSMTabBarHorizontalOrientation,
+    PSMTabBarVerticalOrientation
 } PSMTabBarOrientation;
 
 typedef enum {
-	PSMTabBarTearOffAlphaWindow,
-	PSMTabBarTearOffMiniwindow
+    PSMTabBarTearOffAlphaWindow,
+    PSMTabBarTearOffMiniwindow
 } PSMTabBarTearOffStyle;
 
 enum {
-	PSMTab_SelectedMask				= 1 << 1,
-	PSMTab_LeftIsSelectedMask		= 1 << 2,
-	PSMTab_RightIsSelectedMask		= 1 << 3,
-	PSMTab_PositionLeftMask			= 1 << 4,
-	PSMTab_PositionMiddleMask		= 1 << 5,
-	PSMTab_PositionRightMask		= 1 << 6,
-	PSMTab_PositionSingleMask		= 1 << 7,
+    PSMTab_SelectedMask = 1 << 1,
+    PSMTab_LeftIsSelectedMask = 1 << 2,
+    PSMTab_RightIsSelectedMask = 1 << 3,
+    PSMTab_PositionLeftMask = 1 << 4,
+    PSMTab_PositionMiddleMask = 1 << 5,
+    PSMTab_PositionRightMask = 1 << 6,
+    PSMTab_PositionSingleMask = 1 << 7,
 };
 
 @interface PSMTabBarControl : NSControl {
-												
-	// control basics
-	NSMutableArray							*_cells;								// the cells that draw the tabs
-	IBOutlet NSTabView						*tabView;								// the tab view being navigated
-	PSMOverflowPopUpButton					*_overflowPopUpButton;				// for too many tabs
-	PSMRolloverButton							*_addTabButton;
-	PSMTabBarController						*_controller;
-
-	// Spring-loading.
-	NSTimer									*_springTimer;
-	NSTabViewItem								*_tabViewItemWithSpring;
-
-	// drawing style
-	id<PSMTabStyle>							style;
-	BOOL										_canCloseOnlyTab;
-	BOOL										_disableTabClose;
-	BOOL										_hideForSingleTab;
-	BOOL										_showAddTabButton;
-	BOOL										_sizeCellsToFit;
-	BOOL										_useOverflowMenu;
-	BOOL										_alwaysShowActiveTab;
-	BOOL										_allowsScrubbing;
-	NSInteger									_resizeAreaCompensation;
-	PSMTabBarOrientation						_orientation;
-	BOOL										_automaticallyAnimates;
-	NSTimer									*_animationTimer;
-	PSMTabBarTearOffStyle					_tearOffStyle;
-
-	// behavior
-	BOOL										_allowsBackgroundTabClosing;
-	BOOL										_selectsTabsOnMouseDown;
-
-	// vertical tab resizing
-	BOOL										_allowsResizing;
-	BOOL										_resizing;
-
-	// cell width
-	NSInteger									_cellMinWidth;
-	NSInteger									_cellMaxWidth;
-	NSInteger									_cellOptimumWidth;
-
-	// animation for hide/show
-	NSInteger									_currentStep;
-	BOOL										_isHidden;
-	IBOutlet id								partnerView;							// gets resized when hide/show
-	BOOL										_awakenedFromNib;
-	NSInteger									_tabBarWidth;
-	NSTimer									*_showHideAnimationTimer;
-
-	// drag and drop
-	NSEvent									*_lastMouseDownEvent;				// keep this for dragging reference
-	BOOL										_didDrag;
-	BOOL										_closeClicked;
-
-	// MVC help
-	IBOutlet id								delegate;
+
+    // control basics
+    NSMutableArray *_cells; // the cells that draw the tabs
+    IBOutlet NSTabView *tabView; // the tab view being navigated
+    PSMOverflowPopUpButton *_overflowPopUpButton; // for too many tabs
+    PSMRolloverButton *_addTabButton;
+    PSMTabBarController *_controller;
+
+    // Spring-loading.
+    NSTimer *_springTimer;
+    NSTabViewItem *_tabViewItemWithSpring;
+
+    // drawing style
+    id<PSMTabStyle> style;
+    BOOL _canCloseOnlyTab;
+    BOOL _disableTabClose;
+    BOOL _hideForSingleTab;
+    BOOL _showAddTabButton;
+    BOOL _sizeCellsToFit;
+    BOOL _useOverflowMenu;
+    BOOL _alwaysShowActiveTab;
+    BOOL _allowsScrubbing;
+    NSInteger _resizeAreaCompensation;
+    PSMTabBarOrientation _orientation;
+    BOOL _automaticallyAnimates;
+    NSTimer *_animationTimer;
+    PSMTabBarTearOffStyle _tearOffStyle;
+
+    // behavior
+    BOOL _allowsBackgroundTabClosing;
+    BOOL _selectsTabsOnMouseDown;
+
+    // vertical tab resizing
+    BOOL _allowsResizing;
+    BOOL _resizing;
+
+    // cell width
+    NSInteger _cellMinWidth;
+    NSInteger _cellMaxWidth;
+    NSInteger _cellOptimumWidth;
+
+    // animation for hide/show
+    NSInteger _currentStep;
+    BOOL _isHidden;
+    IBOutlet id partnerView; // gets resized when hide/show
+    BOOL _awakenedFromNib;
+    NSInteger _tabBarWidth;
+    NSTimer *_showHideAnimationTimer;
+
+    // drag and drop
+    NSEvent *_lastMouseDownEvent; // keep this for dragging reference
+    BOOL _didDrag;
+    BOOL _closeClicked;
+
+    // MVC help
+    IBOutlet id delegate;
 }
 
 // control characteristics
@@ -131,7 +131,7 @@ enum {
 - (BOOL)disableTabClose;
 - (void)setDisableTabClose:(BOOL)value;
 - (id<PSMTabStyle>)style;
-- (void)setStyle:(id <PSMTabStyle>)newStyle;
+- (void)setStyle:(id<PSMTabStyle>)newStyle;
 - (NSString *)styleName;
 - (void)setStyleNamed:(NSString *)name;
 - (BOOL)hideForSingleTab;
@@ -184,7 +184,7 @@ enum {
 - (PSMTabBarCell *)lastVisibleTab;
 
 // special effects
-- (void)hideTabBar:(BOOL) hide animate:(BOOL)animate;
+- (void)hideTabBar:(BOOL)hide animate:(BOOL)animate;
 - (BOOL)isTabBarHidden;
 - (BOOL)isAnimating;
 
@@ -194,7 +194,6 @@ enum {
 
 @end
 
-
 @interface NSObject (TabBarControlDelegateMethods)
 
 //Standard NSTabView methods
@@ -203,7 +202,7 @@ enum {
 
 //"Spring-loaded" tabs methods
 - (NSArray *)allowedDraggedTypesForTabView:(NSTabView *)aTabView;
-- (void)tabView:(NSTabView *)aTabView acceptedDraggingInfo:(id <NSDraggingInfo>) draggingInfo onTabViewItem:(NSTabViewItem *)tabViewItem;
+- (void)tabView:(NSTabView *)aTabView acceptedDraggingInfo:(id<NSDraggingInfo>)draggingInfo onTabViewItem:(NSTabViewItem *)tabViewItem;
 
 //Contextual menu method
 - (NSMenu *)tabView:(NSTabView *)aTabView menuForTabViewItem:(NSTabViewItem *)tabViewItem;
@@ -212,8 +211,7 @@ enum {
 - (BOOL)tabView:(NSTabView *)aTabView shouldDragTabViewItem:(NSTabViewItem *)tabViewItem fromTabBar:(PSMTabBarControl *)tabBarControl;
 - (BOOL)tabView:(NSTabView *)aTabView shouldDropTabViewItem:(NSTabViewItem *)tabViewItem inTabBar:(PSMTabBarControl *)tabBarControl;
 - (BOOL)tabView:(NSTabView *)aTabView shouldAllowTabViewItem:(NSTabViewItem *)tabViewItem toLeaveTabBar:(PSMTabBarControl *)tabBarControl;
-- (void)tabView:(NSTabView*)aTabView didDropTabViewItem:(NSTabViewItem *)tabViewItem inTabBar:(PSMTabBarControl *)tabBarControl;
-
+- (void)tabView:(NSTabView *)aTabView didDropTabViewItem:(NSTabViewItem *)tabViewItem inTabBar:(PSMTabBarControl *)tabBarControl;
 
 //Tear-off tabs methods
 - (NSImage *)tabView:(NSTabView *)aTabView imageForTabViewItem:(NSTabViewItem *)tabViewItem offset:(NSSize *)offset styleMask:(NSUInteger *)styleMask;
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabBarController.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.h
index a73a04f1f..80c94df4f 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabBarController.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.h
@@ -12,15 +12,15 @@
 
 @interface PSMTabBarController : NSObject
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-	<NSMenuDelegate>
+                                 <NSMenuDelegate>
 #endif
 {
-	PSMTabBarControl						*_control;
-	NSMutableArray						*_cellTrackingRects;
-	NSMutableArray						*_closeButtonTrackingRects;
-	NSMutableArray						*_cellFrames;
-	NSRect									_addButtonRect;
-	NSMenu									*_overflowMenu;
+    PSMTabBarControl *_control;
+    NSMutableArray *_cellTrackingRects;
+    NSMutableArray *_closeButtonTrackingRects;
+    NSMutableArray *_cellFrames;
+    NSRect _addButtonRect;
+    NSMenu *_overflowMenu;
 }
 
 - (id)initWithTabBarControl:(PSMTabBarControl *)control;
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.h
index 2632e11a0..a3a80982a 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.h
@@ -18,26 +18,26 @@
 @class PSMTabBarCell, PSMTabDragWindowController;
 
 @interface PSMTabDragAssistant : NSObject {
-	PSMTabBarControl					*_sourceTabBar;
-	PSMTabBarControl					*_destinationTabBar;
-	NSMutableSet						*_participatingTabBars;
-	PSMTabBarCell						*_draggedCell;
-	NSUInteger							_draggedCellIndex;					// for snap back
-	BOOL								_isDragging;
-
-	// Support for dragging into new windows
-	PSMTabDragWindowController		*_draggedTab;
-	PSMTabDragWindowController		*_draggedView;
-	NSSize								_dragWindowOffset;
-	NSTimer							*_fadeTimer;
-	BOOL								_centersDragWindows;
-	PSMTabBarTearOffStyle			_currentTearOffStyle;
-
-	// Animation
-	NSTimer							*_animationTimer;
-	NSMutableArray					*_sineCurveWidths;
-	NSPoint							_currentMouseLoc;
-	PSMTabBarCell						*_targetCell;
+    PSMTabBarControl *_sourceTabBar;
+    PSMTabBarControl *_destinationTabBar;
+    NSMutableSet *_participatingTabBars;
+    PSMTabBarCell *_draggedCell;
+    NSUInteger _draggedCellIndex; // for snap back
+    BOOL _isDragging;
+
+    // Support for dragging into new windows
+    PSMTabDragWindowController *_draggedTab;
+    PSMTabDragWindowController *_draggedView;
+    NSSize _dragWindowOffset;
+    NSTimer *_fadeTimer;
+    BOOL _centersDragWindows;
+    PSMTabBarTearOffStyle _currentTearOffStyle;
+
+    // Animation
+    NSTimer *_animationTimer;
+    NSMutableArray *_sineCurveWidths;
+    NSPoint _currentMouseLoc;
+    PSMTabBarCell *_targetCell;
 }
 
 // Creation/destruction
@@ -65,7 +65,7 @@
 - (void)draggingUpdatedInTabBar:(PSMTabBarControl *)control atPoint:(NSPoint)mouseLoc;
 - (void)draggingExitedTabBar:(PSMTabBarControl *)control;
 - (void)performDragOperation;
-- (void)draggedImageEndedAt:(NSPoint) aPoint operation:(NSDragOperation)operation;
+- (void)draggedImageEndedAt:(NSPoint)aPoint operation:(NSDragOperation)operation;
 - (void)finishDrag;
 
 - (void)draggingBeganAt:(NSPoint)aPoint;
@@ -87,7 +87,7 @@
 - (id<PSMTabStyle>)style;
 - (NSMutableArray *)cells;
 - (void)setControlView:(id)view;
-- (id)cellForPoint:(NSPoint) point cellFrame:(NSRectPointer)outFrame;
+- (id)cellForPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame;
 - (PSMTabBarCell *)lastVisibleTab;
 - (NSInteger)numberOfVisibleTabs;
 
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabDragView.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.h
index f8018d290..d106f5106 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabDragView.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.h
@@ -9,9 +9,9 @@
 #import <Cocoa/Cocoa.h>
 
 @interface PSMTabDragView : NSView {
-	NSImage					*_image;
-	NSImage					*_alternateImage;
-	CGFloat					_alpha;
+    NSImage *_image;
+    NSImage *_alternateImage;
+    CGFloat _alpha;
 }
 - (void)setFadeValue:(CGFloat)value;
 - (NSImage *)image;
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.h
index 04cde248c..15d066236 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.h
@@ -11,7 +11,7 @@
 @class PSMTabDragView;
 
 @interface PSMTabDragWindow : NSWindow {
-	PSMTabDragView					*_dragView;
+    PSMTabDragView *_dragView;
 }
 + (PSMTabDragWindow *)dragWindowWithImage:(NSImage *)image styleMask:(NSUInteger)styleMask;
 
diff --git a/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.h
index 5948207f2..bc67622e7 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.h
@@ -15,15 +15,15 @@
 @class PSMTabDragView;
 
 @interface PSMTabDragWindowController : NSWindowController {
-	PSMTabBarTearOffStyle				_tearOffStyle;
-	PSMTabDragView						*_view;
-	NSAnimation							*_animation;
-	NSTimer								*_timer;
+    PSMTabBarTearOffStyle _tearOffStyle;
+    PSMTabDragView *_view;
+    NSAnimation *_animation;
+    NSTimer *_timer;
 
-	BOOL									_showingAlternate;
-	NSRect									_originalWindowFrame;
+    BOOL _showingAlternate;
+    NSRect _originalWindowFrame;
 }
-- (id)initWithImage:(NSImage *)image styleMask:(NSUInteger) styleMask tearOffStyle:(PSMTabBarTearOffStyle)tearOffStyle;
+- (id)initWithImage:(NSImage *)image styleMask:(NSUInteger)styleMask tearOffStyle:(PSMTabBarTearOffStyle)tearOffStyle;
 
 - (NSImage *)image;
 - (NSImage *)alternateImage;
diff --git a/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h
index 20202536a..319fd729d 100644
--- a/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h
+++ b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h
@@ -10,20 +10,20 @@
 #import "PSMTabStyle.h"
 
 @interface PSMUnifiedTabStyle : NSObject <PSMTabStyle> {
-	NSImage									*unifiedCloseButton;
-	NSImage									*unifiedCloseButtonDown;
-	NSImage									*unifiedCloseButtonOver;
-	NSImage									*unifiedCloseDirtyButton;
-	NSImage									*unifiedCloseDirtyButtonDown;
-	NSImage									*unifiedCloseDirtyButtonOver;
-	NSImage									*_addTabButtonImage;
-	NSImage									*_addTabButtonPressedImage;
-	NSImage									*_addTabButtonRolloverImage;
+    NSImage *unifiedCloseButton;
+    NSImage *unifiedCloseButtonDown;
+    NSImage *unifiedCloseButtonOver;
+    NSImage *unifiedCloseDirtyButton;
+    NSImage *unifiedCloseDirtyButtonDown;
+    NSImage *unifiedCloseDirtyButtonOver;
+    NSImage *_addTabButtonImage;
+    NSImage *_addTabButtonPressedImage;
+    NSImage *_addTabButtonRolloverImage;
 
-	NSDictionary								*_objectCountStringAttributes;
+    NSDictionary *_objectCountStringAttributes;
 
-	CGFloat									leftMargin;
-	PSMTabBarControl							*tabBar;
+    CGFloat leftMargin;
+    PSMTabBarControl *tabBar;
 }
 - (void)setLeftMarginForTabBarControl:(CGFloat)margin;
 @end