macosx: fixed compilation after ugly merge

modules/gui/macosx/ExtensionsDialogProvider.h

@@ -4,9 +4,9 @@
  * Copyright (C) 2005-2012 VLC authors and VideoLAN
  * $Id$
  *
- * Authors: Brendon Justin <brendonjustin at gmail.com>,
- *          Derk-Jan Hartman <hartman at videolan dot org>,
- *          Felix Paul Kühne <fkuehne at videolan dot org>
+ * Authors: Brendon Justin <brendonjustin@gmail.com>,
+ *          Derk-Jan Hartman <hartman@videolan dot org>,
+ *          Felix Paul Kühne <fkuehne@videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 /*****************************************************************************
  * ExtensionsDialogProvider interface
  *****************************************************************************/
- at interface ExtensionsDialogProvider : NSObject <NSWindowDelegate>
+@interface ExtensionsDialogProvider : NSObject <NSWindowDelegate>
 {
     intf_thread_t *p_intf;
 }
@@ -61,4 +61,4 @@
 - (VLCDialogWindow *)updateExtensionDialog:(NSValue *)o_value;
 - (void)manageDialog:(extension_dialog_t *)p_dialog;
 
- at end
+@end

modules/gui/macosx/ExtensionsDialogProvider.m

@@ -4,9 +4,9 @@
  * Copyright (C) 2005-2012 VLC authors and VideoLAN
  * $Id$
  *
- * Authors: Brendon Justin <brendonjustin at gmail.com>,
- *          Derk-Jan Hartman <hartman at videolan dot org>,
- *          Felix Paul Kühne <fkuehne at videolan dot org>
+ * Authors: Brendon Justin <brendonjustin@gmail.com>,
+ *          Derk-Jan Hartman <hartman@videolan dot org>,
+ *          Felix Paul Kühne <fkuehne@videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -271,7 +271,7 @@ static int dialogCallback( vlc_object_t *p_this, const char *psz_variable,
     return VLC_SUCCESS;
 }
 
- at implementation ExtensionsDialogProvider
+@implementation ExtensionsDialogProvider
 
 static ExtensionsDialogProvider *_o_sharedInstance = nil;
 
@@ -408,7 +408,7 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil;
     FOREACH_ARRAY(widget, dialog->widgets)
     {
         if (!widget)
-            continue; /* Some widgets may be NULL at this point */
+            continue; /* Some widgets may be NULL@this point */
 
         BOOL shouldDestroy = widget->b_kill;
         NSView *control = widget->p_sys_intf;
@@ -594,4 +594,4 @@ static ExtensionsDialogProvider *_o_sharedInstance = nil;
                         waitUntilDone:YES];
 }
 
- at end
+@end

modules/gui/macosx/ExtensionsManager.h

@@ -4,7 +4,7 @@
  * Copyright (C) 2012 VideoLAN and authors
  * $Id$
  *
- * Authors: Brendon Justin <brendonjustin at gmail.com>
+ * Authors: Brendon Justin <brendonjustin@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,13 +32,13 @@
 
 #import <Cocoa/Cocoa.h>
 
- at class ExtensionsDialogProvider;
+@class ExtensionsDialogProvider;
 
- at protocol ExtensionsDelegate <NSObject>
+@protocol ExtensionsDelegate <NSObject>
 - (void)extensionsUpdated;
- at end
+@end
 
- at interface ExtensionsManager : NSObject
+@interface ExtensionsManager : NSObject
 {
     intf_thread_t *p_intf;
     extensions_manager_t *p_extensions_manager;
@@ -70,6 +70,6 @@
 - (BOOL)isLoaded;
 - (BOOL)cannotLoad;
 
- at property (readonly) BOOL isUnloading;
+@property (readonly) BOOL isUnloading;
 
- at end
+@end

modules/gui/macosx/ExtensionsManager.m

@@ -4,7 +4,7 @@
  * Copyright (C) 2009-2012 VideoLAN and authors
  * $Id$
  *
- * Authors: Brendon Justin <brendonjustin at gmail.com>,
+ * Authors: Brendon Justin <brendonjustin@gmail.com>,
  *          Jean-Philippe André < jpeg # videolan.org >
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,11 +33,11 @@
 #define MENU_GET_ACTION(a) ( (uint16_t)( ((uint32_t)a) >> 16 ) )
 #define MENU_GET_EXTENSION(a) ( (uint16_t)( ((uint32_t)a) & 0xFFFF ) )
 
- at implementation ExtensionsManager
+@implementation ExtensionsManager
 
 static ExtensionsManager* instance = nil;
 
- at synthesize isUnloading = b_unloading;
+@synthesize isUnloading = b_unloading;
 
 + (ExtensionsManager *)getInstance:( intf_thread_t *)_p_intf
 {
@@ -369,4 +369,4 @@ static ExtensionsManager* instance = nil;
     return b_unloading || b_failed;
 }
 
- at end
+@end

modules/gui/macosx/VLCUIWidgets.h

@@ -25,41 +25,41 @@
 #import <Cocoa/Cocoa.h>
 #import <vlc_extensions.h>
 
- at class VLCDialogGridView;
+@class VLCDialogGridView;
 
- at interface VLCDialogButton : NSButton
+@interface VLCDialogButton : NSButton
 
- at property (readwrite) extension_widget_t *widget;
- at end
+@property (readwrite) extension_widget_t *widget;
+@end
 
 
- at interface VLCDialogPopUpButton : NSPopUpButton
+@interface VLCDialogPopUpButton : NSPopUpButton
 
- at property (readwrite) extension_widget_t *widget;
- at end
+@property (readwrite) extension_widget_t *widget;
+@end
 
 
- at interface VLCDialogTextField : NSTextField
+@interface VLCDialogTextField : NSTextField
 
- at property (readwrite) extension_widget_t *widget;
- at end
+@property (readwrite) extension_widget_t *widget;
+@end
 
 
- at interface VLCDialogWindow : NSWindow
+@interface VLCDialogWindow : NSWindow
 
- at property (readwrite) extension_dialog_t *dialog;
- at property (readwrite) BOOL has_lock;
- at end
+@property (readwrite) extension_dialog_t *dialog;
+@property (readwrite) BOOL has_lock;
+@end
 
 
- at interface VLCDialogList : NSTableView <NSTableViewDataSource>
+@interface VLCDialogList : NSTableView <NSTableViewDataSource>
 
- at property (readwrite) extension_widget_t *widget;
- at property (readwrite, retain) NSMutableArray *contentArray;
- at end
+@property (readwrite) extension_widget_t *widget;
+@property (readwrite, retain) NSMutableArray *contentArray;
+@end
 
 
- at interface VLCDialogGridView : NSView {
+@interface VLCDialogGridView : NSView {
     NSUInteger _rowCount, _colCount;
     NSMutableArray *_griddedViews;
 }
@@ -68,6 +68,6 @@
 - (NSSize)flexSize:(NSSize)size;
 - (void)removeSubview:(NSView *)view;
 
- at property (readonly) NSUInteger numViews;
+@property (readonly) NSUInteger numViews;
 
- at end
+@end
\ No newline at end of file

modules/gui/macosx/VLCUIWidgets.m

@@ -26,30 +26,30 @@
 
 #import <stdlib.h>
 
- at implementation VLCDialogButton
- at synthesize widget;
- at end
+@implementation VLCDialogButton
+@synthesize widget;
+@end
 
 
- at implementation VLCDialogPopUpButton
- at synthesize widget;
- at end
+@implementation VLCDialogPopUpButton
+@synthesize widget;
+@end
 
 
- at implementation VLCDialogTextField
- at synthesize widget;
- at end
+@implementation VLCDialogTextField
+@synthesize widget;
+@end
 
 
- at implementation VLCDialogWindow
- at synthesize dialog;
- at synthesize has_lock;
- at end
+@implementation VLCDialogWindow
+@synthesize dialog;
+@synthesize has_lock;
+@end
 
 
- at implementation VLCDialogList
- at synthesize widget;
- at synthesize contentArray;
+@implementation VLCDialogList
+@synthesize widget;
+@synthesize contentArray;
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
 {
@@ -60,10 +60,10 @@
 {
     return [[contentArray objectAtIndex:rowIndex] objectForKey:@"text"];
 }
- at end
+@end
 
 
- at implementation VLCDialogGridView
+@implementation VLCDialogGridView
 
 - (NSUInteger)numViews
 {
@@ -391,4 +391,4 @@
     return size;
 }
 
- at end
+@end