# HG changeset patch # User Markus Bröker # Date 1490722566 -7200 # Node ID 58bbaa38119ee0e396ed41c5c6a2e4e4b6f9ae38 # Parent c344b61ddaf6b7ae4fb5e8c069464a1ff2819502 Coding Style vereinheitlicht diff --git a/PDFViewer/appdelegate/AppDelegate.h b/PDFViewer/appdelegate/AppDelegate.h --- a/PDFViewer/appdelegate/AppDelegate.h +++ b/PDFViewer/appdelegate/AppDelegate.h @@ -10,6 +10,4 @@ @interface AppDelegate : NSObject - @end - diff --git a/PDFViewer/appdelegate/AppDelegate.m b/PDFViewer/appdelegate/AppDelegate.m --- a/PDFViewer/appdelegate/AppDelegate.m +++ b/PDFViewer/appdelegate/AppDelegate.m @@ -15,15 +15,16 @@ @implementation AppDelegate - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - // Insert code here to initialize your application + // Insert code here to initialize your application } - (void)applicationWillTerminate:(NSNotification *)aNotification { - // Insert code here to tear down your application + // Insert code here to tear down your application } -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender { - return TRUE; +- (BOOL)applicationShouldTerminateAfterLastWindowClosed: + (NSApplication *)sender { + return TRUE; } @end diff --git a/PDFViewer/pdfviewer/PDFViewer.h b/PDFViewer/pdfviewer/PDFViewer.h --- a/PDFViewer/pdfviewer/PDFViewer.h +++ b/PDFViewer/pdfviewer/PDFViewer.h @@ -8,10 +8,10 @@ #import @interface PDFViewer : PDFView { - NSSpeechSynthesizer *synthesizer; + NSSpeechSynthesizer *synthesizer; } --(NSMutableString*) getTexts; --(void) speak: (NSMutableString*) texts; --(void) stopSpeaking; +- (NSMutableString *)getTexts; +- (void)speak:(NSMutableString *)texts; +- (void)stopSpeaking; @end diff --git a/PDFViewer/pdfviewer/PDFViewer.m b/PDFViewer/pdfviewer/PDFViewer.m --- a/PDFViewer/pdfviewer/PDFViewer.m +++ b/PDFViewer/pdfviewer/PDFViewer.m @@ -10,49 +10,50 @@ @implementation PDFViewer --(void) awakeFromNib { - synthesizer = [[NSSpeechSynthesizer alloc] initWithVoice:[NSSpeechSynthesizer defaultVoice]]; +- (void)awakeFromNib { + synthesizer = [[NSSpeechSynthesizer alloc] initWithVoice:[NSSpeechSynthesizer defaultVoice]]; } --(NSMutableString*) getTexts { - NSMutableString *strings = [[NSMutableString alloc] init]; - NSUInteger nOps = [[self document] pageCount]; - - [strings appendString: [NSString stringWithFormat: @"Genosse Parteisekretär, das Dokument hat %lu Seiten", nOps]]; - - for (int pages = 0; pages < nOps; pages++) { - PDFPage *page = [[self document] pageAtIndex: pages]; - [strings appendString: [self replaceString: [page string]]]; - } - - return strings; +- (NSMutableString *)getTexts { + NSMutableString *strings = [[NSMutableString alloc] init]; + NSUInteger nOps = [[self document] pageCount]; + + [strings appendString:[NSString stringWithFormat:@"Genosse Parteisekretär, das Dokument hat %lu Seiten", nOps]]; + + for (int pages = 0; pages < nOps; pages++) { + PDFPage *page = [[self document] pageAtIndex:pages]; + [strings appendString:[self replaceString:[page string]]]; + } + + return strings; } --(void) speak: (NSMutableString*) texts { - // Die Audioausgabe muss immer gestoppt werden, bevor Sie erneut gestartet werden darf! - [self stopSpeaking]; - - [synthesizer startSpeakingString:texts]; -} +- (void)speak:(NSMutableString *)texts { + // Die Audioausgabe muss immer gestoppt werden, bevor Sie erneut gestartet + // werden darf! + [self stopSpeaking]; --(void) stopSpeaking { - if ([synthesizer isSpeaking]) { - [synthesizer stopSpeaking]; - } + [synthesizer startSpeakingString:texts]; } --(NSString*) replaceString: (NSString*) inputStr { - NSDictionary *replacements = @{ - @"SED": @"S.E.D.", - @"DDR": @"D.D.R.", - @" IM ": @" I.M. ", - }; - - for (id key in replacements) { - inputStr = [inputStr stringByReplacingOccurrencesOfString:key withString: replacements[key]]; - } - - return inputStr; +- (void)stopSpeaking { + if ([synthesizer isSpeaking]) { + [synthesizer stopSpeaking]; + } +} + +- (NSString *)replaceString:(NSString *)inputStr { + NSDictionary *replacements = @{ + @"SED" : @"S.E.D.", + @"DDR" : @"D.D.R.", + @" IM " : @" I.M. ", + }; + + for (id key in replacements) { + inputStr = [inputStr stringByReplacingOccurrencesOfString:key withString:replacements[key]]; + } + + return inputStr; } @end diff --git a/PDFViewer/viewcontroller/ViewController.h b/PDFViewer/viewcontroller/ViewController.h --- a/PDFViewer/viewcontroller/ViewController.h +++ b/PDFViewer/viewcontroller/ViewController.h @@ -6,9 +6,9 @@ // Copyright © 2017 Markus Bröker. All rights reserved. // +#import "PDFViewer.h" #import -#import "PDFViewer.h" @interface ViewController : NSViewController -@property (weak) IBOutlet PDFViewer *pdfViewer; +@property(weak) IBOutlet PDFViewer *pdfViewer; @end diff --git a/PDFViewer/viewcontroller/ViewController.m b/PDFViewer/viewcontroller/ViewController.m --- a/PDFViewer/viewcontroller/ViewController.m +++ b/PDFViewer/viewcontroller/ViewController.m @@ -13,26 +13,26 @@ @synthesize pdfViewer = _pdfViewer; - (void)viewDidLoad { - [super viewDidLoad]; - - NSString *str = @"https://derinistihbarat.files.wordpress.com/2012/08/die-doktorarbeit-von-stasi-koko-chef-alexander-schalck-golodtkowski.pdf"; - - NSURL *url = [NSURL URLWithString:str]; - - PDFDocument *doc = [[PDFDocument alloc] initWithURL:url]; - [_pdfViewer setDocument: doc]; + [super viewDidLoad]; + + NSString *str = @"https://derinistihbarat.files.wordpress.com/2012/08/die-doktorarbeit-von-stasi-koko-chef-alexander-schalck-golodtkowski.pdf"; + + NSURL *url = [NSURL URLWithString:str]; + + PDFDocument *doc = [[PDFDocument alloc] initWithURL:url]; + [_pdfViewer setDocument:doc]; } -- (void) viewDidAppear { - [_pdfViewer speak: [_pdfViewer getTexts]]; +- (void)viewDidAppear { + [_pdfViewer speak:[_pdfViewer getTexts]]; } --(void) viewDidDisappear { - [_pdfViewer stopSpeaking]; +- (void)viewDidDisappear { + [_pdfViewer stopSpeaking]; } - (void)setRepresentedObject:(id)representedObject { - [super setRepresentedObject:representedObject]; + [super setRepresentedObject:representedObject]; } @end