[vlc-commits] macosx: fixed compilation after ugly merge

[Felix Paul Kühne]

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jan 14 19:55:37 2012 +0100| [ff2b15c79865f5608821668113c10971f69bfab9] | committer: Jean-Baptiste Kempf

macosx: fixed compilation after ugly merge
(cherry picked from commit 7e47a1f723ed381b86f66cd93465e7fdbd95723c)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=ff2b15c79865f5608821668113c10971f69bfab9
---

 modules/gui/macosx/ExtensionsDialogProvider.h |   10 +++---
 modules/gui/macosx/ExtensionsDialogProvider.m |   12 +++---
 modules/gui/macosx/ExtensionsManager.h        |   14 ++++----
 modules/gui/macosx/ExtensionsManager.m        |    8 ++--
 modules/gui/macosx/VLCUIWidgets.h             |   42 ++++++++++++------------
 modules/gui/macosx/VLCUIWidgets.m             |   38 +++++++++++-----------
 6 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/modules/gui/macosx/ExtensionsDialogProvider.h b/modules/gui/macosx/ExtensionsDialogProvider.h
index eab8b7f..fbd401e 100644
--- a/modules/gui/macosx/ExtensionsDialogProvider.h
+++ b/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 at gmail.com>,
+ *          Derk-Jan Hartman <hartman at videolan dot org>,
+ *          Felix Paul Kühne <fkuehne at 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>
+ at 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
+ at end
diff --git a/modules/gui/macosx/ExtensionsDialogProvider.m b/modules/gui/macosx/ExtensionsDialogProvider.m
index 5d98d5d..37a1e4e 100644
--- a/modules/gui/macosx/ExtensionsDialogProvider.m
+++ b/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 at gmail.com>,
+ *          Derk-Jan Hartman <hartman at videolan dot org>,
+ *          Felix Paul Kühne <fkuehne at 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
+ at 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 at 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
+ at end
diff --git a/modules/gui/macosx/ExtensionsManager.h b/modules/gui/macosx/ExtensionsManager.h
index 3022f8f..a6c97a7 100644
--- a/modules/gui/macosx/ExtensionsManager.h
+++ b/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 at 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;
+ at class ExtensionsDialogProvider;
 
- at protocol ExtensionsDelegate <NSObject>
+ at protocol ExtensionsDelegate <NSObject>
 - (void)extensionsUpdated;
- at end
+ at end
 
- at interface ExtensionsManager : NSObject
+ at 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;
+ at property (readonly) BOOL isUnloading;
 
- at end
+ at end
diff --git a/modules/gui/macosx/ExtensionsManager.m b/modules/gui/macosx/ExtensionsManager.m
index 4db951f..bb5be08 100644
--- a/modules/gui/macosx/ExtensionsManager.m
+++ b/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 at 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
+ at implementation ExtensionsManager
 
 static ExtensionsManager* instance = nil;
 
- at synthesize isUnloading = b_unloading;
+ at 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
+ at end
diff --git a/modules/gui/macosx/VLCUIWidgets.h b/modules/gui/macosx/VLCUIWidgets.h
index 7c94b06..456ab93 100644
--- a/modules/gui/macosx/VLCUIWidgets.h
+++ b/modules/gui/macosx/VLCUIWidgets.h
@@ -25,41 +25,41 @@
 #import <Cocoa/Cocoa.h>
 #import <vlc_extensions.h>
 
- at class VLCDialogGridView;
+ at class VLCDialogGridView;
 
- at interface VLCDialogButton : NSButton
+ at interface VLCDialogButton : NSButton
 
- at property (readwrite) extension_widget_t *widget;
- at end
+ at property (readwrite) extension_widget_t *widget;
+ at end
 
 
- at interface VLCDialogPopUpButton : NSPopUpButton
+ at interface VLCDialogPopUpButton : NSPopUpButton
 
- at property (readwrite) extension_widget_t *widget;
- at end
+ at property (readwrite) extension_widget_t *widget;
+ at end
 
 
- at interface VLCDialogTextField : NSTextField
+ at interface VLCDialogTextField : NSTextField
 
- at property (readwrite) extension_widget_t *widget;
- at end
+ at property (readwrite) extension_widget_t *widget;
+ at end
 
 
- at interface VLCDialogWindow : NSWindow
+ at interface VLCDialogWindow : NSWindow
 
- at property (readwrite) extension_dialog_t *dialog;
- at property (readwrite) BOOL has_lock;
- at end
+ at property (readwrite) extension_dialog_t *dialog;
+ at property (readwrite) BOOL has_lock;
+ at end
 
 
- at interface VLCDialogList : NSTableView <NSTableViewDataSource>
+ at interface VLCDialogList : NSTableView <NSTableViewDataSource>
 
- at property (readwrite) extension_widget_t *widget;
- at property (readwrite, retain) NSMutableArray *contentArray;
- at end
+ at property (readwrite) extension_widget_t *widget;
+ at property (readwrite, retain) NSMutableArray *contentArray;
+ at end
 
 
- at interface VLCDialogGridView : NSView {
+ at 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;
+ at property (readonly) NSUInteger numViews;
 
- at end
\ No newline at end of file
+ at end
\ No newline at end of file
diff --git a/modules/gui/macosx/VLCUIWidgets.m b/modules/gui/macosx/VLCUIWidgets.m
index ca534ef..9abc48c 100644
--- a/modules/gui/macosx/VLCUIWidgets.m
+++ b/modules/gui/macosx/VLCUIWidgets.m
@@ -26,30 +26,30 @@
 
 #import <stdlib.h>
 
- at implementation VLCDialogButton
- at synthesize widget;
- at end
+ at implementation VLCDialogButton
+ at synthesize widget;
+ at end
 
 
- at implementation VLCDialogPopUpButton
- at synthesize widget;
- at end
+ at implementation VLCDialogPopUpButton
+ at synthesize widget;
+ at end
 
 
- at implementation VLCDialogTextField
- at synthesize widget;
- at end
+ at implementation VLCDialogTextField
+ at synthesize widget;
+ at end
 
 
- at implementation VLCDialogWindow
- at synthesize dialog;
- at synthesize has_lock;
- at end
+ at implementation VLCDialogWindow
+ at synthesize dialog;
+ at synthesize has_lock;
+ at end
 
 
- at implementation VLCDialogList
- at synthesize widget;
- at synthesize contentArray;
+ at implementation VLCDialogList
+ at synthesize widget;
+ at synthesize contentArray;
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
 {
@@ -60,10 +60,10 @@
 {
     return [[contentArray objectAtIndex:rowIndex] objectForKey:@"text"];
 }
- at end
+ at end
 
 
- at implementation VLCDialogGridView
+ at implementation VLCDialogGridView
 
 - (NSUInteger)numViews
 {
@@ -391,4 +391,4 @@
     return size;
 }
 
- at end
+ at end