[vlc-commits] macosx: simplify prefs widgets header

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Aug 24 13:52:43 2012 +0200| [41857c81b5bbeb7695f41b3472024e609ed46872] | committer: Felix Paul Kühne

macosx: simplify prefs widgets header

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

 modules/gui/macosx/prefs_widgets.h |   28 ++++++++++++++++------------
 modules/gui/macosx/prefs_widgets.m |    2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h
index 31853ef..1365b87 100644
--- a/modules/gui/macosx/prefs_widgets.h
+++ b/modules/gui/macosx/prefs_widgets.h
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * prefs_widgets.h: Preferences controls
  *****************************************************************************
- * Copyright (C) 2002-2007 VLC authors and VideoLAN
+ * Copyright (C) 2002-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan.org>
+ *          Felix Paul Kühne <fkuehne at videolan.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
@@ -38,23 +39,26 @@ static NSMenu   *o_keys_menu = nil;
     bool      b_advanced;
 }
 
+ at property (readonly) NSString * name;
+ at property (readonly) int type;
+ at property (readonly) int viewType;
+ at property (readonly) BOOL advanced;
+ at property (readonly) int intValue;
+ at property (readonly) float floatValue;
+ at property (readonly) char * stringValue;
+ at property (readonly) int labelSize;
+
 + (VLCConfigControl *)newControl: (module_config_t *)_p_item
         withView: (NSView *)o_parent_view;
++ (int)calcVerticalMargin: (int)i_curItem lastItem:(int)i_lastItem;
+
 - (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item;
-- (NSString *)name;
-- (int)type;
-- (int)viewType;
-- (BOOL)isAdvanced;
+
 - (void)setYPos:(int)i_yPos;
-- (int)intValue;
-- (float)floatValue;
-- (char *)stringValue;
+- (void)alignWithXPosition:(int)i_xPos;
+
 - (void)applyChanges;
 - (void)resetValues;
-- (int)labelSize;
-- (void) alignWithXPosition:(int)i_xPos;
-
-+ (int)calcVerticalMargin: (int)i_curItem lastItem:(int)i_lastItem;
 
 @end
 
diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index 6d923d2..306497c 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -894,7 +894,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain];       \
     return i_view_type;
 }
 
-- (BOOL)isAdvanced
+- (BOOL)advanced
 {
     return b_advanced;
 }