various structural changes, _ObjC-ification, attempting to reconcile …

…all submodules
mralexgray · Mar 31, 2015 · 2727be7 · 2727be7
1 parent dc9d97f
commit 2727be7
Show file tree

Hide file tree

Showing 240 changed files with 2,294 additions and 8,952 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/AtoZ/AZBoxView/AZBoxGrid.h b/AtoZ/AZBoxView/AZBoxGrid.h
@@ -73,12 +73,12 @@
 	BOOL unselectOnMouseUp;
 	BOOL updatingData, calledReloadData;
 }
-@property (NATOM, ASS) BOOL magicSizing;
-@property (NATOM, ASS) float boxInset;
-@property (NATOM, ASS) float boxRadius;
-@property (NATOM, ASS) float scalar;
-@property (NATOM, ASS) NSUInteger numberOfColumns;
-@property (NATOM, ASS) NSUInteger numberOfRows;
+@property (NA, ASS) BOOL magicSizing;
+@property (NA, ASS) float boxInset;
+@property (NA, ASS) float boxRadius;
+@property (NA, ASS) float scalar;
+@property (NA, ASS) NSUInteger numberOfColumns;
+@property (NA, ASS) NSUInteger numberOfRows;
 
 //- (void)mouseDown:(NSEvent *)event;
 //- (void)mouseDragged:(NSEvent *)event;

diff --git a/AtoZ/AZGeometry/AZMatrix.h b/AtoZ/AZGeometry/AZMatrix.h
@@ -11,7 +11,7 @@
 	NSMA *data;
 }
 
-@property (NATOM,ASS) NSUI width, height;
+@property (NA,ASS) NSUI width, height;
 
 - (id) objectAtX:(NSUInteger)x y:(NSUInteger)y;
 

diff --git a/AtoZ/AZGeometry/AZRect.h b/AtoZ/AZGeometry/AZRect.h
@@ -8,8 +8,7 @@
 //+ (INST) rect;
 
 //#import <Zangetsu/Zangetsu.h>
-#import "BoundingObject.h"
-
+//#import "BoundingObject.h"
 
 
 
@@ -29,12 +28,12 @@
 //- (id) initFromPoint:(NSP)ptOne toPoint:(NSP)ptTwo;
 //- (id) initWithFrame:(NSR)frame inFrame:(NSR)superframe;
 
-//@property (NATOM) CGP 		anchor;//, position;
-//@property (NATOM) CGF 		 maxX, maxY, minY, minX;//, w, h;width, height,
-//@property (NATOM) NSP 		origin, center, apex;
-//@property (NATOM) NSSZ 	size;
-//@property (NATOM) NSR 		 r; // rect,
-//@property (NATOM) AZA	orient;
+//@property (NA) CGP 		anchor;//, position;
+//@property (NA) CGF 		 maxX, maxY, minY, minX;//, w, h;width, height,
+//@property (NA) NSP 		origin, center, apex;
+//@property (NA) NSSZ 	size;
+//@property (NA) NSR 		 r; // rect,
+//@property (NA) AZA	orient;
 
 //- (void) setApex:(NSP)p move1Scale2:(NSN*)n;
 
@@ -80,9 +79,9 @@ static inline NSR AZCenteredRect(NSSize aSize, NSR inRect)
 
 @interface AZEdge : NSObject
 + (INST) rect:(AZRect*)r along:(AZRect*)outer inside:(BOOL)isinide;
-@property (NATOM) AZA alignment;
-@property (NATOM) AZOrient orient;
-@property (NATOM) CGF cornerTreshHold, snapThreshold;
+@property (NA) AZA alignment;
+@property (NA) AZOrient orient;
+@property (NA) CGF cornerTreshHold, snapThreshold;
 //- (void) moveInDirection:(NSSZ)sz;
 @end
 

diff --git a/AtoZ/AZGeometry/AZSegmentedRect.h b/AtoZ/AZGeometry/AZSegmentedRect.h
@@ -18,13 +18,13 @@
 + (AZSegmentedRect*) rectWithRect: (NSR) rect	cubicSize: (NSUInteger) size;
 + (AZSegmentedRect*) rectWithRect: (NSR) rect	width: 	   (NSUInteger) width 	height: (NSUInteger) height;
 
-@property (NATOM,ASS)  AZOrient *orientation;
-@property (NATOM,ASS)  BOOL emptyBorder;
-@property (NATOM,ASS)  NSUI horizontalSegments;
-@property (NATOM,ASS)  NSUI verticalSegments;
+@property (NA,ASS)  AZOrient *orientation;
+@property (NA,ASS)  BOOL emptyBorder;
+@property (NA,ASS)  NSUI horizontalSegments;
+@property (NA,ASS)  NSUI verticalSegments;
 
-@property (NATOM,ASS)  NSSZ minimumSegmentSize;
-@property (NATOM,ASS)  NSSZ maximumSegmentSize;
+@property (NA,ASS)  NSSZ minimumSegmentSize;
+@property (NA,ASS)  NSSZ maximumSegmentSize;
 
 @prop_RO  NSUI segmentCount;
 @prop_RO  NSSZ 	 segmentSize;

diff --git a/AtoZ/AZGeometry/AtoZGeometry.h b/AtoZ/AZGeometry/AtoZGeometry.h
@@ -616,14 +616,14 @@ extern "C" {
 
 @interface AZPoint : NSObject <AZScalar>
 
-@property (NATOM) NSP point;
-@property (NATOM) CGF x, y;
+@property (NA) NSP point;
+@property (NA) CGF x, y;
 
 @end
 
 @interface AZSize : NSObject  <AZScalar>
-@property (NATOM) CGF 	width, height;
-@property (NATOM) NSSZ  size;
+@property (NA) CGF 	width, height;
+@property (NA) NSSZ  size;
 @end
 */
 

diff --git a/AtoZ/AZLayerGrid/AZOverlay.h b/AtoZ/AZLayerGrid/AZOverlay.h
@@ -179,12 +179,12 @@
 /** Select all overlays.
  
  @param sender Typically the object that sent the message.	*/
-- (IBAction)selectAllOverlays:_;
+- (IBAction)selectAllOverlays:__ _
 
 /** Deselect all overlays.
  
  @param sender Typically the object that sent the message.	*/
-- (IBAction)deselectAllOverlays:_;
+- (IBAction)deselectAllOverlays:__ _
 
 /// ---------------------------------
 /// @name Setting Display Attributes

diff --git a/AtoZ/AtoZ Encyclopedia/AZEncyclopediaDelegate.h b/AtoZ/AtoZ Encyclopedia/AZEncyclopediaDelegate.h
@@ -29,17 +29,17 @@
 	NSMutableArray *noteControllers;
 }
 
-@property (NATOM, ASS) 	IBOutlet NSProgressIndicator *pIndi;
-@property (NATOM, ASS)   IBOutlet TransparentWindow *controlWindow;
+@property (NA, ASS) 	IBOutlet NSProgressIndicator *pIndi;
+@property (NA, ASS)   IBOutlet TransparentWindow *controlWindow;
 //@property (nonatomic, retain)  IBOutlet NSWindow *attachedWindow;
 
-- (IBAction) addNote:_;
-                              - (IBAction) removeAllNotes:_;
-                              - (IBAction) goMouseTest:_;
-                              - (IBAction) reload:_;
+- (IBAction) addNote:__ _
+                              - (IBAction) removeAllNotes:__ _
+                              - (IBAction) goMouseTest:__ _
+                              - (IBAction) reload:__ _
                               - (IBAction) moveThemAll:(id) sender;
 - (IBAction) cancel:(id) sender;
-@property (NATOM, ASS) CGRect scaledUnit;
+@property (NA, ASS) CGRect scaledUnit;
 @property (nonatomic, strong) IBOutlet iCarouselViewController *vc;
 //@property (nonatomic, retain) IBOutlet AtoZInfinity *infinityView;
 //@property (nonatomic, strong) AZWindowExtend *window;
@@ -63,7 +63,7 @@
 
 @property (nonatomic, strong) IBOutlet AZToggleArrayView   *sortToggle;
 
-//-(IBAction)toggleShake:_;
+//-(IBAction)toggleShake:__ _
 
 @end
 /*

diff --git a/AtoZ/AtoZ Encyclopedia/AZSourceListViewController.h b/AtoZ/AtoZ Encyclopedia/AZSourceListViewController.h
@@ -20,8 +20,8 @@
 //@property (nonatomic, assign) IBOutlet NSString *point2y;
 @property (weak) IBOutlet iCarouselViewController *carrie;
 
-- (IBAction) goMouseTest:_;
-                              - (IBAction) reload:_;
+- (IBAction) goMouseTest:__ _
+                              - (IBAction) reload:__ _
                               - (IBAction) moveThemAll:(id) sender;
 - (IBAction) cancel:(id) sender;
 

diff --git a/AtoZ/AtoZ Encyclopedia/IsometricView.h b/AtoZ/AtoZ Encyclopedia/IsometricView.h
@@ -11,7 +11,7 @@
 void DrawBluePrintInRectWithScale(NSR r,CGF gridSize);
 
 @interface BlueprintView : NSView
-@property  (NATOM) CGF gridSize;
+@property  (NA) CGF gridSize;
 @end
 
 @interface IsometricView : NSView {
@@ -25,11 +25,11 @@ void DrawBluePrintInRectWithScale(NSR r,CGF gridSize);
 
 @property (weak) IBOutlet NSMatrix *editorSelector;
 
-- (IBAction)new:_;
+- (IBAction)new:__ _
                               - (void)enableShadows:(BOOL)hasShadows;
 
-- (IBAction)toggleShadows:_;
-                              - (IBAction)appearWithRotation:_;
-                              - (IBAction)appearWithTranslation:_;
-                              - (IBAction)appearWithScale:_;
+- (IBAction)toggleShadows:__ _
+                              - (IBAction)appearWithRotation:__ _
+                              - (IBAction)appearWithTranslation:__ _
+                              - (IBAction)appearWithScale:__ _
                               @end
diff --git a/AtoZ/AtoZ Encyclopedia/iCarouselViewController.h b/AtoZ/AtoZ Encyclopedia/iCarouselViewController.h
@@ -24,14 +24,14 @@ typedef  enum {
 @property (nonatomic, assign) float multi;
 @property (nonatomic, assign) float space;
 
-- (IBAction)readFormAndReload:_;
+- (IBAction)readFormAndReload:__ _
 
-- (IBAction)setOffsets:_;
-                              - (IBAction)switchCarouselType:_;
-                              - (IBAction)toggleVertical:_;
-                              - (IBAction)toggleWrap:_;
-                              - (IBAction)insertItem:_;
-                              - (IBAction)removeItem:_;
+- (IBAction)setOffsets:__ _
+                              - (IBAction)switchCarouselType:__ _
+                              - (IBAction)toggleVertical:__ _
+                              - (IBAction)toggleWrap:__ _
+                              - (IBAction)insertItem:__ _
+                              - (IBAction)removeItem:__ _
 
 @property (assign) IBOutlet NSForm *form;
 

diff --git a/AtoZ/AtoZ Encyclopedia/iCarouselViewController.m b/AtoZ/AtoZ Encyclopedia/iCarouselViewController.m
@@ -9,7 +9,7 @@
 #import "iCarouselViewController.h"
 
 @interface iCarouselViewController ()
-@property (NATOM, ASS) iCarouselOption spacing;
+@property (NA, ASS) iCarouselOption spacing;
 @property (nonatomic, assign) BOOL wrap;
 	//@property (nonatomic, retain) NSArray *items;
 @property (nonatomic, assign) NSUInteger scalar;

diff --git a/AtoZ/AtoZ Entitlement/AZEntitlementDelegate.h b/AtoZ/AtoZ Entitlement/AZEntitlementDelegate.h
@@ -3,19 +3,19 @@
 @class AZQuadCarousel;
 @interface AZEntitlementDelegate : NSObject <NSApplicationDelegate>
 
-@property (NATOM, STR) AZCalculatorController *cc;
-@property (NATOM, ASS) IBOutlet AZTrackingWindow *north;
-@property (NATOM, ASS) IBOutlet AZTrackingWindow *south;
-@property (NATOM, ASS) IBOutlet AZTrackingWindow *east;
-@property (NATOM, ASS) IBOutlet AZTrackingWindow *west;
+@property (NA, STR) AZCalculatorController *cc;
+@property (NA, ASS) IBOutlet AZTrackingWindow *north;
+@property (NA, ASS) IBOutlet AZTrackingWindow *south;
+@property (NA, ASS) IBOutlet AZTrackingWindow *east;
+@property (NA, ASS) IBOutlet AZTrackingWindow *west;
 
-@property (NATOM, STR) NSString *log;
-@property (NATOM, STR) AtoZ *dbx;
+@property (NA, STR) NSString *log;
+@property (NA, STR) AtoZ *dbx;
 @property IBOutlet NSView* imageView;
-@property (NATOM, STR) IBOutlet AZQuadCarousel *quad;
+@property (NA, STR) IBOutlet AZQuadCarousel *quad;
 
 @end
 
 //@property (nonatomic, retain) AZFileGridView *g;
-//- (IBAction)saveAction:_;
+//- (IBAction)saveAction:__ _
 
diff --git a/AtoZ/AtoZ Entitlement/AZQuadObject.h b/AtoZ/AtoZ Entitlement/AZQuadObject.h
@@ -3,31 +3,31 @@
 
 @interface AZQuadCarousel : NSObject <iCarouselDataSource, iCarouselDelegate, NSWindowDelegate>
 
-@property (NATOM, STR) AZTW 	*track_N, 	*track_S, 	*track_E, 	*track_W;
-@property (NATOM, STR) iC 		 *menu_N, 	 *menu_S, 	 *menu_E, 	 *menu_W;
-@property (NATOM) iC *activeMenu;
+@property (NA, STR) AZTW 	*track_N, 	*track_S, 	*track_E, 	*track_W;
+@property (NA, STR) iC 		 *menu_N, 	 *menu_S, 	 *menu_E, 	 *menu_W;
+@property (NA) iC *activeMenu;
 
-@property (NATOM) iCarouselType cType;
-@property (NATOM) CGF 	fontSize;
-@property (NATOM) NSUI 	iconStyle, 	selectedIndex, 	tilt;
+@property (NA) iCarouselType cType;
+@property (NA) CGF 	fontSize;
+@property (NA) NSUI 	iconStyle, 	selectedIndex, 	tilt;
 @prop_RO NSRNG selectedRange;
-@property (NATOM, STR) NSS 		*activeMenuID,	*activeTrackID;
-@property (NATOM, STR) NSD 		*windowLog;
+@property (NA, STR) NSS 		*activeMenuID,	*activeTrackID;
+@property (NA, STR) NSD 		*windowLog;
 @prop_RO 			 NSA 		*menus, 			*tracks;
 
-@property (NATOM) Option option;
+@property (NA) Option option;
 @property (UNSF) id refToSelf;
 
-@property (NATOM, STR) NSMutableArray 	*items;
-@property (NATOM, STR) NSD 					*quads;
-@property (NATOM, STR) AZSegmentedRect 	*seg;
+@property (NA, STR) NSMutableArray 	*items;
+@property (NA, STR) NSD 					*quads;
+@property (NA, STR) AZSegmentedRect 	*seg;
 
 - (IBAction) toggleQuadFlip: _;
                               //- (IBAction) toggleQuad:	 _;
                               //- (IBAction) setType:		 _;
 
--(IBAction)advance:_;
-                              -(IBAction)rewind:_;
+-(IBAction)advance:__ _
+                              -(IBAction)rewind:__ _
 
 @end