Browse Source

Code cleanup: remove dead code; synthesize expressions, ivars due property autosynthesis

Gleb Pinigin 12 years ago
parent
commit
897e279137

+ 2 - 6
AspenProject/VLCAboutViewController.h

@@ -9,16 +9,12 @@
 #import <UIKit/UIKit.h>
 
 @interface VLCAboutViewController : UIViewController
-{
-    UITextView *_textContents;
-    UILabel *_aspenVersion;
-    UILabel *_vlckitVersion;
-    UIBarButtonItem *_dismissButton;
-}
+
 @property (nonatomic, retain) IBOutlet UITextView *textContents;
 @property (nonatomic, retain) IBOutlet UILabel *aspenVersion;
 @property (nonatomic, retain) IBOutlet UILabel *vlckitVersion;
 @property (nonatomic, retain) IBOutlet UIBarButtonItem *dismissButton;
+
 - (IBAction)dismiss:(id)sender;
 
 @end

+ 1 - 1
AspenProject/VLCAboutViewController.m

@@ -13,7 +13,6 @@
 @end
 
 @implementation VLCAboutViewController
-@synthesize textContents=_textContents, aspenVersion=_aspenVersion, vlckitVersion=_vlckitVersion;
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
@@ -26,6 +25,7 @@
     [_textContents release];
     [_aspenVersion release];
     [_vlckitVersion release];
+    [_dismissButton release];
     [super dealloc];
 }
 

+ 2 - 4
AspenProject/VLCAppDelegate.h

@@ -14,10 +14,8 @@
     VLCPlaylistViewController *_playlistViewController;
 }
 
-@property (strong, nonatomic) UIWindow *window;
+@property (nonatomic, retain) UIWindow *window;
 
-@property (strong, nonatomic) UINavigationController *navigationController;
-
-@property (strong, nonatomic) UISplitViewController *splitViewController;
+@property (nonatomic, retain) UINavigationController *navigationController;
 
 @end

+ 0 - 1
AspenProject/VLCAppDelegate.m

@@ -19,7 +19,6 @@
     [_playlistViewController release];
     [_window release];
     [_navigationController release];
-    [_splitViewController release];
     [super dealloc];
 }
 

+ 2 - 2
AspenProject/VLCMovieViewController.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface VLCMovieViewController : UIViewController <UISplitViewControllerDelegate, VLCMediaPlayerDelegate, UIActionSheetDelegate>
+@interface VLCMovieViewController : UIViewController <VLCMediaPlayerDelegate, UIActionSheetDelegate>
 {
     VLCMediaPlayer *_mediaPlayer;
 
@@ -34,7 +34,7 @@
 @property (nonatomic, retain) IBOutlet UILabel *playingExternallyTitle;
 @property (nonatomic, retain) IBOutlet UILabel *playingExternallyDescription;
 
-@property (strong, nonatomic) MLFile *mediaItem;
+@property (nonatomic, retain) MLFile *mediaItem;
 
 - (IBAction)closePlayback:(id)sender;
 - (IBAction)positionSliderAction:(id)sender;

+ 1 - 15
AspenProject/VLCMovieViewController.m

@@ -253,21 +253,7 @@
     }
 }
 
-#pragma mark - Split view
-
-- (void)splitViewController:(UISplitViewController *)splitController willHideViewController:(UIViewController *)viewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)popoverController
-{
-    barButtonItem.title = NSLocalizedString(@"Master", @"Master");
-    [self.navigationItem setLeftBarButtonItem:barButtonItem animated:YES];
-    self.masterPopoverController = popoverController;
-}
-
-- (void)splitViewController:(UISplitViewController *)splitController willShowViewController:(UIViewController *)viewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem
-{
-    // Called when the view is shown again in the split view, invalidating the button and popover controller.
-    [self.navigationItem setLeftBarButtonItem:nil animated:YES];
-    self.masterPopoverController = nil;
-}
+#pragma mark -
 
 - (void)appWillResign:(NSNotification *)aNotification
 {

+ 1 - 5
AspenProject/VLCPlaylistTableViewCell.h

@@ -9,11 +9,7 @@
 #import <Foundation/Foundation.h>
 
 @interface VLCPlaylistTableViewCell : UITableViewCell
-{
-    UILabel *_titleLabel;
-    UILabel *_subtitleLabel;
-    UIImageView *_thumbnailView;
-}
+
 @property (nonatomic, retain) IBOutlet UILabel *titleLabel;
 @property (nonatomic, retain) IBOutlet UILabel *subtitleLabel;
 @property (nonatomic, retain) IBOutlet UIImageView *thumbnailView;

+ 0 - 1
AspenProject/VLCPlaylistTableViewCell.m

@@ -9,7 +9,6 @@
 #import "VLCPlaylistTableViewCell.h"
 
 @implementation VLCPlaylistTableViewCell
-@synthesize titleLabel = _titleLabel, subtitleLabel = _subtitleLabel, thumbnailView = _thumbnailView;
 
 + (VLCPlaylistTableViewCell *)cellWithReuseIdentifier:(NSString *)ident
 {

+ 3 - 6
AspenProject/VLCPlaylistViewController.h

@@ -13,13 +13,10 @@
 @class VLCAboutViewController;
 
 @interface VLCPlaylistViewController : UIViewController <AQGridViewDataSource, AQGridViewDelegate, UITableViewDataSource, UITableViewDelegate>
-{
-    UITableView *_tableView;
-    AQGridView *_gridview;
-}
 
-@property (strong, nonatomic) VLCMovieViewController *movieViewController;
-@property (strong, nonatomic) VLCAboutViewController *aboutViewController;
+
+@property (nonatomic, retain) VLCMovieViewController *movieViewController;
+@property (nonatomic, retain) VLCAboutViewController *aboutViewController;
 
 @property (nonatomic, retain) IBOutlet UITableView *tableView;
 @property (nonatomic, retain) IBOutlet AQGridView *gridView;

+ 1 - 2
AspenProject/VLCPlaylistViewController.m

@@ -18,7 +18,6 @@
 @end
 
 @implementation VLCPlaylistViewController
-@synthesize gridView=_gridview;
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
@@ -32,7 +31,7 @@
 - (void)dealloc
 {
     [_tableView release];
-    [_gridview release];
+    [_gridView release];
     [_aboutViewController release];
     [_movieViewController release];
     [_foundMedia release];