Use Brackets for global headers.

[vlc] / modules / gui / macosx / prefs.h

diff --git a/modules/gui/macosx/prefs.h b/modules/gui/macosx/prefs.h
index 0bf1595682f4b12ec358ceebcb4885119b42a203..b996e92db310296ef386c96995f48729be0446e8 100644 (file)
--- a/modules/gui/macosx/prefs.h
+++ b/modules/gui/macosx/prefs.h
@@ -21,31 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-@interface VLCTreeItem : NSObject
-{
-    NSString *o_name;
-    NSString *o_title;
-    NSString *o_help;
-    int i_object_id;
-    VLCTreeItem *o_parent;
-    NSMutableArray *o_children;
-    int i_object_category;
-    NSMutableArray *o_subviews;
-}
-
-+ (VLCTreeItem *)rootItem;
-- (int)numberOfChildren;
-- (VLCTreeItem *)childAtIndex:(int)i_index;
-- (int)getObjectID;
-- (NSString *)getName;
-- (NSString *)getTitle;
-- (NSString *)getHelp;
-- (BOOL)hasPrefs:(NSString *)o_module_name;
-- (NSView *)showView:(NSScrollView *)o_prefs_view advancedView:(bool) b_advanced;
-- (void)applyChanges;
-- (void)resetView;
-
-@end
+@class VLCTreeMainItem;
 
 /*****************************************************************************
  * VLCPrefs interface
@@ -53,8 +29,7 @@
 @interface VLCPrefs : NSObject
 {
     intf_thread_t *p_intf;
-    bool b_advanced;
-    VLCTreeItem *o_config_tree;
+    VLCTreeMainItem * _rootTreeItem;
     NSView *o_empty_view;
     NSMutableDictionary *o_save_prefs;
 
@@ -65,7 +40,7 @@
     IBOutlet id o_save_btn;
     IBOutlet id o_cancel_btn;
     IBOutlet id o_reset_btn;
-    IBOutlet id o_advanced_ckb;
+    IBOutlet id o_basicFull_matrix;
 }
 
 + (VLCPrefs *)sharedInstance;
@@ -76,7 +51,7 @@
 - (IBAction)savePrefs: (id)sender;
 - (IBAction)closePrefs: (id)sender;
 - (IBAction)resetAll: (id)sender;
-- (IBAction)advancedToggle: (id)sender;
+- (IBAction)buttonAction: (id)sender;
 
 @end