Skip to content

Commit

Permalink
silence compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
martinh committed Jul 8, 2012
1 parent 1506b35 commit ddfb5f6
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/PSMMetalTabStyle.m
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ - (void)drawInteriorWithTabCell:(PSMTabBarCell *)cell inView:(NSView*)controlVie
// icon
if([cell hasIcon]){
NSRect iconRect = [self iconRectForTabCell:cell];
NSImage *icon = [[[[cell representedObject] identifier] content] icon];
NSImage *icon = [[[(NSTabViewItem *)[cell representedObject] identifier] content] icon];
if ([controlView isFlipped]) {
iconRect.origin.y = cellFrame.size.height - iconRect.origin.y;
}
Expand Down
6 changes: 4 additions & 2 deletions app/PSMTabBarControl.m
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ - (id)cellForPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame;
- (PSMTabBarCell *)lastVisibleTab;
- (int)numberOfVisibleTabs;

- (void)animateShowHide:(NSTimer *)timer;

@end

@implementation PSMTabBarControl
Expand Down Expand Up @@ -773,10 +775,10 @@ - (void)update
[menuItem setRepresentedObject:[cell representedObject]];
[cell setIsInOverflowMenu:YES];
[[cell indicator] removeFromSuperview];
if ([[cell representedObject] isEqualTo:[tabView selectedTabViewItem]])
if ([(NSTabViewItem *)[cell representedObject] isEqualTo:[tabView selectedTabViewItem]])
[menuItem setState:NSOnState];
if([cell hasIcon])
[menuItem setImage:[[[[cell representedObject] identifier] content] icon]];
[menuItem setImage:[[[(NSTabViewItem *)[cell representedObject] identifier] content] icon]];
if([cell count] > 0)
[menuItem setTitle:[[menuItem title] stringByAppendingFormat:@" (%d)",[cell count]]];
[overflowMenu addItem:menuItem];
Expand Down
1 change: 1 addition & 0 deletions app/SFTPConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,5 +267,6 @@
- (BOOL)closed;
- (BOOL)connected;
- (NSURL *)normalizeURL:(NSURL *)aURL;
- (NSString *)stringByAbbreviatingWithTildeInPath:(NSURL *)aURL;

@end
2 changes: 0 additions & 2 deletions app/ViWindow.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@interface ViWindow : NSWindow
{
}
- (BOOL)isFullScreen;
- (id)firstResponderOrDelegate;
@end

2 changes: 1 addition & 1 deletion lemon/lempar.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static void yy_destructor(
YYCODETYPE yymajor, /* Type code for object to destroy */
YYMINORTYPE *yypminor /* The object to be destroyed */
){
ParseARG_FETCH;
// XXX: ParseARG_FETCH;
switch( yymajor ){
/* Here is inserted the actions which take place when a
** terminal or non-terminal is destroyed. This can happen
Expand Down
2 changes: 2 additions & 0 deletions universalchardet/nscore.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,15 @@
/**
* Deprecated declarations.
*/
#if 0
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
# define NS_DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
# define NS_DEPRECATED __declspec(deprecated)
#else
# define NS_DEPRECATED
#endif
#endif

/**
* Generic API modifiers which return the standard XPCOM nsresult type
Expand Down

0 comments on commit ddfb5f6

Please sign in to comment.