diff options
| author | ritsuka <[email protected]> | 2014-10-23 08:34:55 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2014-10-23 08:34:55 +0000 |
| commit | 95089f01515fc339a3cd6254c93e620bab701d37 (patch) | |
| tree | 66e7953ecb260cfe4d39308485440f8df9ef647f | |
| parent | ed4ec257d9efc7254a4cc15e3b24fe8686eb07a2 (diff) | |
MacGui: fixed another numbers of warnings.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6458 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | macosx/Controller.m | 2 | ||||
| -rw-r--r-- | macosx/HBImageAndTextCell.m | 3 | ||||
| -rw-r--r-- | macosx/HBLanguagesSelection.m | 2 | ||||
| -rw-r--r-- | macosx/HBUtilities.h | 2 | ||||
| -rw-r--r-- | macosx/HBUtilities.m | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 0fed3077e..f1b221ab5 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -2816,7 +2816,7 @@ fWorkingCount = 0; [fSrcChapterEndPopUp selectItemAtIndex: [[queueToApply objectForKey:@"ChapterEnd"] intValue] - 1]; /* File Format */ - [fDstFormatPopUp selectItemWithTag:queueToApply[@"JobFileFormatMux"]]; + [fDstFormatPopUp selectItemWithTag:[queueToApply[@"JobFileFormatMux"] integerValue]]; [self formatPopUpChanged:nil]; /* Chapter Markers*/ diff --git a/macosx/HBImageAndTextCell.m b/macosx/HBImageAndTextCell.m index 5e2a09cad..eebe2efca 100644 --- a/macosx/HBImageAndTextCell.m +++ b/macosx/HBImageAndTextCell.m @@ -9,6 +9,7 @@ #import "HBImageAndTextCell.h" +#if 0 static inline CGFloat xLeftInRect(NSSize innerSize, NSRect outerRect) { @@ -66,7 +67,7 @@ scaleProportionally(NSSize imageSize, NSRect canvasRect) return imageSize; } - +#endif @implementation HBImageAndTextCell diff --git a/macosx/HBLanguagesSelection.m b/macosx/HBLanguagesSelection.m index bdc6ed7ae..7e9ad62ac 100644 --- a/macosx/HBLanguagesSelection.m +++ b/macosx/HBLanguagesSelection.m @@ -240,7 +240,7 @@ NSString *kHBLanguagesDragRowsType = @"kHBLanguagesDragRowsType"; { if (([info draggingSourceOperationMask] == NSDragOperationCopy)) { - return nil; + return NO; } if ([info draggingSource] == view) diff --git a/macosx/HBUtilities.h b/macosx/HBUtilities.h index f3f39501b..8669dab49 100644 --- a/macosx/HBUtilities.h +++ b/macosx/HBUtilities.h @@ -39,6 +39,6 @@ chapters:(NSRange)chaptersRange quality:(NSString *)quality bitrate:(NSString *)bitrate - videoCodec:(uint32_t *)codec; + videoCodec:(uint32_t)codec; @end diff --git a/macosx/HBUtilities.m b/macosx/HBUtilities.m index 1ccd78630..30f403a29 100644 --- a/macosx/HBUtilities.m +++ b/macosx/HBUtilities.m @@ -43,7 +43,7 @@ chapters:(NSRange)chaptersRange quality:(NSString *)quality bitrate:(NSString *)bitrate - videoCodec:(uint32_t *)codec + videoCodec:(uint32_t)codec { NSMutableString *name = [[[NSMutableString alloc] init] autorelease]; // The format array contains the tokens as NSString |