Skip to content

Commit

Permalink
Complete Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheBrokenRail
TheBrokenRail committed May 11, 2020
1 parent 8b121b0 commit 2bbb8b8
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 60 deletions.
6 changes: 3 additions & 3 deletions AppKit/NSBitmapImageRep.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ + (NSArray *) imageUnfilteredFileTypes {
[NSArray arrayWithObjects:
// Try to order them so the most used ones are at the top
// of the list
@"png", @"tiff", @"tif", @"jpg", @"jpeg", @"icns",
@"gif", @"bmp", @"PNG", @"TIFF", @"TIF", @"JPG",
@"JPEG", @"ICNS", @"jpe", @"JPE", @"GIF", @"BMP", nil];
@"png", @"tiff", @"tif", @"jpg", @"jpeg", @"icns", @"gif",
@"bmp", @"PNG", @"TIFF", @"TIF", @"JPG", @"JPEG", @"ICNS",
@"jpe", @"JPE", @"GIF", @"BMP", nil];
}

+ (NSArray *) imageRepsWithContentsOfFile: (NSString *) path {
Expand Down
4 changes: 2 additions & 2 deletions AppKit/NSColor.subproj/conversions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static inline void NSColorHSBToRGB(CGFloat hue, CGFloat saturation,
*bluep = blue + m;

// NSLog(@"RGB(%f, %f, %f) <- HSB(%f, %f, %f)", *redp, *greenp, *bluep,
//hue, saturation, brightness);
// hue, saturation, brightness);
}

static inline void NSColorRGBToHSB(CGFloat red, CGFloat green, CGFloat blue,
Expand Down Expand Up @@ -130,5 +130,5 @@ static inline void NSColorRGBToHSB(CGFloat red, CGFloat green, CGFloat blue,
*brightnessp = V;
}
// NSLog(@"RGB(%f, %f, %f) -> HSB(%f, %f, %f)", red, green, blue, H/360.f,
//S, V);
// S, V);
}
90 changes: 45 additions & 45 deletions AppKit/NSTextView.subproj/NSBidiHelper.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,51 +681,51 @@ unsigned long resolveExplicit(int level, int dir, uint8_t *pcls,

static int stateWeak[][10] = {
// N, L, R, AN, EN, AL,NSM, CS, ES, ET,
/*xa*/ ao, xl, xr, cn, cn, xa,
xa, ao, ao, ao, /* arabic letter */
/*xr*/ ro, xl, xr, ra, re, xa,
xr, ro, ro, rt, /* right letter */
/*xl*/ lo, xl, xr, la, le, xa,
xl, lo, lo, lt, /* left letter */

/*ao*/ ao, xl, xr, cn, cn, xa,
ao, ao, ao, ao, /* arabic lett. foll by ON*/
/*ro*/ ro, xl, xr, ra, re, xa,
ro, ro, ro, rt, /* right lett. foll by ON */
/*lo*/ lo, xl, xr, la, le, xa,
lo, lo, lo, lt, /* left lett. foll by ON */

/*rt*/ ro, xl, xr, ra, re, xa,
rt, ro, ro, rt, /* ET following R */
/*lt*/ lo, xl, xr, la, le, xa,
lt, lo, lo, lt, /* ET following L */

/*cn*/ ao, xl, xr, cn, cn, xa,
cn, ac, ao, ao, /* EN, AN following AL */
/*ra*/ ro, xl, xr, ra, re, xa,
ra, rc, ro, rt, /* arabic number foll R */
/*re*/ ro, xl, xr, ra, re, xa,
re, rs, rs, ret, /* european number foll R */
/*la*/ lo, xl, xr, la, le, xa,
la, lc, lo, lt, /* arabic number foll L */
/*le*/ lo, xl, xr, la, le, xa,
le, ls, ls, let, /* european number foll L */

/*ac*/ ao, xl, xr, cn, cn, xa,
ao, ao, ao, ao, /* CS following cn */
/*rc*/ ro, xl, xr, ra, re, xa,
ro, ro, ro, rt, /* CS following ra */
/*rs*/ ro, xl, xr, ra, re, xa,
ro, ro, ro, rt, /* CS,ES following re */
/*lc*/ lo, xl, xr, la, le, xa,
lo, lo, lo, lt, /* CS following la */
/*ls*/ lo, xl, xr, la, le, xa,
lo, lo, lo, lt, /* CS,ES following le */

/*ret*/ ro, xl, xr, ra, re, xa,
ret, ro, ro, ret, /* ET following re */
/*let*/ lo, xl, xr, la, le, xa,
let, lo, lo, let, /* ET following le */
/*xa*/ ao, xl, xr, cn, cn,
xa, xa, ao, ao, ao, /* arabic letter */
/*xr*/ ro, xl, xr, ra, re,
xa, xr, ro, ro, rt, /* right letter */
/*xl*/ lo, xl, xr, la, le,
xa, xl, lo, lo, lt, /* left letter */

/*ao*/ ao, xl, xr, cn, cn,
xa, ao, ao, ao, ao, /* arabic lett. foll by ON*/
/*ro*/ ro, xl, xr, ra, re,
xa, ro, ro, ro, rt, /* right lett. foll by ON */
/*lo*/ lo, xl, xr, la, le,
xa, lo, lo, lo, lt, /* left lett. foll by ON */

/*rt*/ ro, xl, xr, ra, re,
xa, rt, ro, ro, rt, /* ET following R */
/*lt*/ lo, xl, xr, la, le,
xa, lt, lo, lo, lt, /* ET following L */

/*cn*/ ao, xl, xr, cn, cn,
xa, cn, ac, ao, ao, /* EN, AN following AL */
/*ra*/ ro, xl, xr, ra, re,
xa, ra, rc, ro, rt, /* arabic number foll R */
/*re*/ ro, xl, xr, ra, re,
xa, re, rs, rs, ret, /* european number foll R */
/*la*/ lo, xl, xr, la, le,
xa, la, lc, lo, lt, /* arabic number foll L */
/*le*/ lo, xl, xr, la, le,
xa, le, ls, ls, let, /* european number foll L */

/*ac*/ ao, xl, xr, cn, cn,
xa, ao, ao, ao, ao, /* CS following cn */
/*rc*/ ro, xl, xr, ra, re,
xa, ro, ro, ro, rt, /* CS following ra */
/*rs*/ ro, xl, xr, ra, re,
xa, ro, ro, ro, rt, /* CS,ES following re */
/*lc*/ lo, xl, xr, la, le,
xa, lo, lo, lo, lt, /* CS following la */
/*ls*/ lo, xl, xr, la, le,
xa, lo, lo, lo, lt, /* CS,ES following le */

/*ret*/ ro, xl, xr, ra, re,
xa, ret, ro, ro, ret, /* ET following re */
/*let*/ lo, xl, xr, la, le,
xa, let, lo, lo, let, /* ET following le */

};

Expand Down
2 changes: 1 addition & 1 deletion AppKit/include/AppKit/NSObjectController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
- (void) prepareContent;

//-(BOOL)fetchWithRequest:(NSFetchRequest *)fetchRequest merge:(BOOL)merge
//error:(NSError **)error;
// error:(NSError **)error;

//-(BOOL)validateMenuItem:(NSMenuItem *)menuItem;

Expand Down
4 changes: 2 additions & 2 deletions AppKit/include/AppKit/NSView.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,8 @@ APPKIT_EXPORT const NSNotificationName NSViewGlobalFrameDidChangeNotification;
atPoint: (NSPoint) origin;
// Blocks aren't supported by the compiler yet.
//-(void)showDefinitionForAttributedString:(NSAttributedString *)string
//range:(NSRange)range options:(NSDictionary *)options
//baselineOriginProvider:(NSPoint (^)(NSRange adjustedRange))originProvider;
// range:(NSRange)range options:(NSDictionary *)options
// baselineOriginProvider:(NSPoint (^)(NSRange adjustedRange))originProvider;

// private,move
- (NSArray *) _draggedTypes;
Expand Down
4 changes: 2 additions & 2 deletions Onyx2D/O2Font.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ + (void) initialize {
// Override that by a better list in the O2Font concrete subclass
[O2Font
setPreferredFontNames:
[NSArray arrayWithObjects: @"Arial", // Latin/Greek/Cyrillic,
// Arabic, Hebrew
[NSArray arrayWithObjects: @"Arial", // Latin/Greek/Cyrillic,
// Arabic, Hebrew
@"Meiryo", // Japanese
@"FangSong", // Simplified Chinese
@"MingLiU", // Traditional Chinese
Expand Down
4 changes: 2 additions & 2 deletions Onyx2D/O2PDFContext.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,8 @@ - (void) drawPath: (O2PathDrawingMode) pathMode {
[self emitSaveGState];
[self emitCurrentGState]; // spool the graphic state before the actual path,
// because some old Adobe Software,
[self emitPath: _path]; // e.g. AR 7 and AI CS2, complain about "Invalid
// operation inside a path" otherwise.
[self emitPath: _path]; // e.g. AR 7 and AI CS2, complain about "Invalid
// operation inside a path" otherwise.

switch (pathMode) {
case kO2PathFill:
Expand Down
4 changes: 2 additions & 2 deletions Onyx2D/platform_Windows/O2Font_gdi.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,8 @@ + (void) initialize {
// Set some decent defaut substitution fonts
[O2Font
setPreferredFontNames:
[NSArray arrayWithObjects: @"Arial", // Latin/Greek/Cyrillic,
// Arabic, Hebrew
[NSArray arrayWithObjects: @"Arial", // Latin/Greek/Cyrillic,
// Arabic, Hebrew
@"Meiryo", // Japanese
@"FangSong", // Simplified Chinese
@"MingLiU", // Traditional Chinese
Expand Down
2 changes: 1 addition & 1 deletion formatting/format.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ cd ../

clang-format --version

find . -path './clang-format' -prune -o -path './.git' -prune -o \( \( -name '*.m' -o -name '*.mm' -o -name '*.h' -o -name '*.cpp' -o -name '*.c' \) -a -exec clang-format --verbose --style file -i {} \; \)
find . -path './formatting' -prune -o -path './.git' -prune -o \( \( -name '*.m' -o -name '*.mm' -o -name '*.h' -o -name '*.cpp' -o -name '*.c' \) -a -exec clang-format --verbose --style file -i {} \; \)

0 comments on commit 2bbb8b8

Please sign in to comment.