Remove useless variables (with property defined)

Classes/ChatRoomTableViewController.h

@@ -24,7 +24,6 @@
 @interface ChatRoomTableViewController : UITableViewController {
 @private
     NSMutableArray *data;
-    NSString *remoteAddress;
 }
 
 @property (nonatomic, retain) NSString *remoteAddress;

Classes/ChatRoomViewController.h

@@ -27,17 +27,8 @@
 #include "linphonecore.h"
 
 @interface ChatRoomViewController : UIViewController<UITextFieldDelegate, UICompositeViewDelegate> {
-    ChatRoomTableViewController *tableController;
-    UITextField *messageField;
-    UIButton *sendButton;
-    NSString *remoteAddress;
-    UIToggleButton *editButton;
+    @private
     LinphoneChatRoom *chatRoom;
-    UILabel *addressLabel;
-    UIImageView *avatarImage;
-    UIView *headerView;
-    UIView *footerView;
-    UIImageView *fieldBackgroundImage;
 }
 
 

Classes/ChatViewController.h

@@ -25,8 +25,6 @@
 #import "UICompositeViewController.h"
 
 @interface ChatViewController : UIViewController<UICompositeViewDelegate> {
-    ChatTableViewController *tableController;
-    UIToggleButton *editButton;
 }
 
 @property (nonatomic, retain) IBOutlet ChatTableViewController* tableController;

Classes/ConsoleViewController.h

@@ -22,8 +22,6 @@
 #import "LogView.h"
 
 @interface ConsoleViewController : UIViewController <LogView> {
-	UITextView* logs;
-	UIView*		logsView;
 }
 
 -(void) doAction;

Classes/ContactDetailsImagePickerController.h

@@ -26,8 +26,6 @@
 @end
 
 @interface ContactDetailsImagePickerController : UIImagePickerController <UICompositeViewDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate> {
-@private
-        id<ContactDetailsImagePickerDelegate> imagePickerDelegate;
 }
 
 @property (nonatomic, retain) id<ContactDetailsImagePickerDelegate> imagePickerDelegate;

Classes/ContactDetailsLabelViewController.h

@@ -27,10 +27,6 @@
 @end
 
 @interface ContactDetailsLabelViewController : UIViewController<UITableViewDelegate, UITableViewDataSource, UICompositeViewDelegate> {
-    NSDictionary *dataList;
-    UITableView *tableView;
-    NSString *selectedData;
-    id<ContactDetailsLabelViewDelegate> delegate;
 }
 
 @property (nonatomic, copy) NSString *selectedData;

Classes/ContactDetailsLabelViewController.m

@@ -83,10 +83,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark - Property Functions
 
 - (void)setDataList:(NSDictionary *)adatalist {
-    if (self->dataList != nil) {
-        [self->dataList release];
+    if([dataList isEqualToDictionary:adatalist]) {
+        return;
     }
-    self->dataList = [adatalist retain];
+    [dataList release];
+    dataList = [adatalist retain];
     [tableView reloadData];
 }
 

Classes/ContactDetailsTableViewController.h

@@ -27,13 +27,9 @@
 
 @interface ContactDetailsTableViewController : UITableViewController<ContactDetailsLabelViewDelegate, UITextFieldDelegate> {
 @private
-    ABRecordRef contact;
     NSMutableArray *dataCache;
     NSMutableArray *labelArray;
     NSIndexPath *editingIndexPath;
-    UIContactDetailsHeader *headerController;
-    UIContactDetailsFooter *footerController;
-    id<ContactDetailsDelegate> contactDetailsDelegate;
 }
 
 @property (nonatomic, assign) ABRecordRef contact;

Classes/ContactDetailsTableViewController.m

@@ -369,7 +369,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C
     if(contact != nil && ABRecordGetRecordID(contact) == kABRecordInvalidID) {
         CFRelease(contact);
     }
-    self->contact = acontact;
+    contact = acontact;
     [self loadData];
     [headerController setContact:contact];
 }

Classes/ContactDetailsViewController.h

@@ -25,12 +25,6 @@
 #import "ContactDetailsTableViewController.h"
 
 @interface ContactDetailsViewController : UIViewController<UICompositeViewDelegate, ContactDetailsDelegate> {
-    ContactDetailsTableViewController *tableController;
-    ABRecordRef contact;
-    UIToggleButton *editButton;
-    UIButton *backButton;
-    UIButton *cancelButton;
-    
     ABAddressBookRef addressBook;
     BOOL inhibUpdate;
 }

Classes/ContactDetailsViewController.m

@@ -142,20 +142,20 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
 
 - (void)newContact {
     [LinphoneLogger logc:LinphoneLoggerLog format:"New contact"];
-    self->contact = NULL;
+    contact = NULL;
     [self resetData];
-    self->contact = ABPersonCreate();
-    [tableController setContact:self->contact];
+    contact = ABPersonCreate();
+    [tableController setContact:contact];
     [self enableEdit:FALSE];
     [[tableController tableView] reloadData];
 }
 
 - (void)newContact:(NSString*)address {
     [LinphoneLogger logc:LinphoneLoggerLog format:"New contact"];
-    self->contact = NULL;
+    contact = NULL;
     [self resetData];
-    self->contact = ABPersonCreate();
-    [tableController setContact:self->contact];
+    contact = ABPersonCreate();
+    [tableController setContact:contact];
     [tableController addSipField:address];
     [self enableEdit:FALSE];
     [[tableController tableView] reloadData];
@@ -163,20 +163,20 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
 
 - (void)editContact:(ABRecordRef)acontact {
     [LinphoneLogger logc:LinphoneLoggerLog format:"Edit contact %p", acontact];
-    self->contact = NULL;
+    contact = NULL;
     [self resetData];
-    self->contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact));
-    [tableController setContact:self->contact];
+    contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact));
+    [tableController setContact:contact];
     [self enableEdit:FALSE];
     [[tableController tableView] reloadData];
 }
 
 - (void)editContact:(ABRecordRef)acontact address:(NSString*)address {
     [LinphoneLogger logc:LinphoneLoggerLog format:"Edit contact %p", acontact];
-    self->contact = NULL;
+    contact = NULL;
     [self resetData];
-    self->contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact));
-    [tableController setContact:self->contact];
+    contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact));
+    [tableController setContact:contact];
     [tableController addSipField:address];
     [self enableEdit:FALSE];
     [[tableController tableView] reloadData];
@@ -187,10 +187,10 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
 
 - (void)setContact:(ABRecordRef)acontact {
     [LinphoneLogger logc:LinphoneLoggerLog format:"Set contact %p", acontact];
-    self->contact = NULL;
+    contact = NULL;
     [self resetData];
-    self->contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact));
-    [tableController setContact:self->contact];
+    contact = ABAddressBookGetPersonWithRecordID(addressBook, ABRecordGetRecordID(acontact));
+    [tableController setContact:contact];
 }
 
 

Classes/ContactsTableViewController.h

@@ -23,6 +23,7 @@
 #import "OrderedDictionary.h"
 
 @interface ContactsTableViewController : UITableViewController {
+    @private
     OrderedDictionary* addressBookMap;
     NSMutableDictionary* avatarMap;
     

Classes/ContactsViewController.h

@@ -42,13 +42,6 @@ typedef enum _ContactSelectionMode {
 @end
 
 @interface ContactsViewController : UIViewController<UICompositeViewDelegate> {
-    ContactsTableViewController *tableController;
-    UITableView *tableView;
-    
-    UIButton *allButton;
-    UIButton *linphoneButton;
-    UIButton *backButton;
-    UIButton *addButton;
 }
 
 @property (nonatomic, retain) IBOutlet ContactsTableViewController* tableController;

Classes/DialerViewController.h

@@ -27,31 +27,6 @@
 #import "UIDigitButton.h"
 
 @interface DialerViewController : UIViewController <UITextFieldDelegate, UICompositeViewDelegate> {
-@private
-	//Buttons
-	UITextField*    addressField;
-    UIButton*       addContactButton;
-    UIButton*       backButton;
-	UIEraseButton*  eraseButton;
-	UICallButton*   callButton;
-    UICallButton*   addCallButton;
-    UITransferButton*   transferButton;
-
-	//Key pad
-	UIDigitButton*  oneButton;
-	UIDigitButton*  twoButton;
-	UIDigitButton*  threeButton;
-	UIDigitButton*  fourButton;
-	UIDigitButton*  fiveButton;
-	UIDigitButton*  sixButton;
-	UIDigitButton*  sevenButton;
-	UIDigitButton*  eightButton;
-	UIDigitButton*  nineButton;
-	UIDigitButton*  starButton;
-	UIDigitButton*  zeroButton;
-	UIDigitButton*  sharpButton;
-    
-    BOOL transferMode;
 }
 
 - (void)setAddress:(NSString*)address;
@@ -68,18 +43,18 @@
 @property (nonatomic, retain) IBOutlet UIButton* backButton;
 @property (nonatomic, retain) IBOutlet UIEraseButton* eraseButton;
 
-@property (nonatomic, retain) IBOutlet UIButton* oneButton;
-@property (nonatomic, retain) IBOutlet UIButton* twoButton;
-@property (nonatomic, retain) IBOutlet UIButton* threeButton;
-@property (nonatomic, retain) IBOutlet UIButton* fourButton;
-@property (nonatomic, retain) IBOutlet UIButton* fiveButton;
-@property (nonatomic, retain) IBOutlet UIButton* sixButton;
-@property (nonatomic, retain) IBOutlet UIButton* sevenButton;
-@property (nonatomic, retain) IBOutlet UIButton* eightButton;
-@property (nonatomic, retain) IBOutlet UIButton* nineButton;
-@property (nonatomic, retain) IBOutlet UIButton* starButton;
-@property (nonatomic, retain) IBOutlet UIButton* zeroButton;
-@property (nonatomic, retain) IBOutlet UIButton* sharpButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* oneButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* twoButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* threeButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* fourButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* fiveButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* sixButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* sevenButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* eightButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* nineButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* starButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton;
 
 - (IBAction)onAddContactClick: (id) event;
 - (IBAction)onBackClick: (id) event;

Classes/FirstLoginViewController.h

@@ -22,11 +22,6 @@
 #import "UICompositeViewController.h"
 
 @interface FirstLoginViewController : UIViewController<UITextFieldDelegate, UICompositeViewDelegate> {
-	UIButton* loginButton;
-	UIButton* siteButton;
-	UITextField* usernameField;
-    UITextField* passwordField;
-	UIView* waitView;
 }
 
 - (IBAction)onLoginClick:(id)sender;

Classes/HistoryDetailsViewController.h

@@ -24,17 +24,7 @@
 #import "UICompositeViewController.h"
 
 @interface HistoryDetailsViewController : UIViewController<UICompositeViewDelegate> {
-    LinphoneCallLog *callLog;
-    UIImageView *avatarImage;
-    UILabel *addressLabel;
-    UILabel *dateLabel;
-    UILabel *dateHeaderLabel;
-    UILabel *durationLabel;
-    UILabel *durationHeaderLabel;
-    UILabel *typeLabel;
-    UILabel *typeHeaderLabel;
-    UIButton *addressButton;
-    UIButton *addContactButton;
+    @private
     ABRecordRef contact;
 }
 @property (nonatomic, retain) IBOutlet  UIImageView *avatarImage;

Classes/HistoryTableViewController.h

@@ -21,7 +21,6 @@
 
 @interface HistoryTableViewController : UITableViewController {
     @private
-    BOOL missedFilter;
     NSMutableArray *callLogs;
 }
 

Classes/HistoryTableViewController.m

@@ -69,7 +69,10 @@
 #pragma mark - Property Functions
 
 - (void)setMissedFilter:(BOOL)amissedFilter {
-    self->missedFilter = amissedFilter;
+    if(missedFilter == amissedFilter) {
+        return;
+    }
+    missedFilter = amissedFilter;
     [self loadData];
     [[self tableView] reloadData];
 }

Classes/HistoryViewController.h

@@ -24,13 +24,6 @@
 #import "UIToggleButton.h"
 
 @interface HistoryViewController : UIViewController<UICompositeViewDelegate> {
-    @private
-    HistoryTableViewController *tableController;
-    UITableView *tableView;
-    
-    UIButton *allButton;
-    UIButton *missedButton;
-    UIToggleButton *editButton;
 }
 
 @property (nonatomic, retain) IBOutlet HistoryTableViewController* tableController;

Classes/InCallTableViewController.m

@@ -34,7 +34,7 @@ enum TableSection {
 #pragma mark - Lifecycle Functions
 
 - (void)initInCallTableViewController {
-    self->callCellData = [[NSMutableDictionary alloc] init];
+    callCellData = [[NSMutableDictionary alloc] init];
 }
 
 - (id)init{

Classes/InCallViewController.h

@@ -29,26 +29,11 @@
 @class VideoViewController;
 
 @interface InCallViewController : UIViewController <CallActionSheetDelegate, UIGestureRecognizerDelegate, UICompositeViewDelegate> {
-    
-    InCallTableViewController* callTableController;
-    UITableView* callTableView;
-    
-    UIView* videoGroup;
-    UIView* videoView;
-    UIView* videoPreview;
-#ifdef TEST_VIDEO_VIEW_CHANGE
-    UIView* testVideoView;
-#endif
-    UICamSwitch* videoCameraSwitch;
+    @private
     UITapGestureRecognizer* singleFingerTap;
-    
-    UIActivityIndicatorView* videoWaitingForFirstImage;
-    
     NSTimer* hideControlsTimer;
-    
     BOOL videoShown;
     VideoZoomHandler* videoZoomHandler;
-    
     UIActionSheet* visibleActionSheet;
 }
 

Classes/IncomingCallViewController.h

@@ -31,11 +31,6 @@
 @end
 
 @interface IncomingCallViewController : UIViewController <UICompositeViewDelegate> {
-@private
-    UILabel* addressLabel;
-    UIImageView* avatarImage;
-    LinphoneCall *call;
-    id<IncomingCallViewDelegate> delegate;
 }
 
 @property (nonatomic, retain) IBOutlet UILabel* addressLabel;

Classes/LinphoneManager.h

@@ -74,19 +74,10 @@ typedef struct _LinphoneManagerSounds {
     
 @private
 	NSTimer* mIterateTimer;
-	bool isbackgroundModeEnabled;
     
 	Connectivity connectivity;
-	const char*  frontCamId;
-	const char*  backCamId;
     
-    FastAddressBook* fastAddressBook;
-    
-    LinphoneManagerSounds sounds;
     NSMutableArray *inhibitedEvent;
-    id<IASKSettingsStore> settingsStore;
-    sqlite3 *database;
-    
     
 @public
     CallContext currentCallContextBeforeGoingBackground;

Classes/LinphoneUI/UICallBar.h

@@ -28,32 +28,6 @@
 #import "TPMultiLayoutViewController.h"
 
 @interface UICallBar: TPMultiLayoutViewController {
-    UIPauseButton*      pauseButton;
-    UIButton*           conferenceButton;
-    UIVideoButton*      videoButton;
-    UIMicroButton*      microButton;
-    UISpeakerButton*    speakerButton;   
-    UIToggleButton*     optionsButton;
-    UIHangUpButton*     hangupButton;
-    UIView*             padView;
-    UIView*             optionsView;
-    UIButton*           optionsAddButton;
-    UIButton*           optionsTransferButton;
-    UIToggleButton*     dialerButton;
-    
-    //Key pad
-	UIDigitButton*  oneButton;
-	UIDigitButton*  twoButton;
-	UIDigitButton*  threeButton;
-	UIDigitButton*  fourButton;
-	UIDigitButton*  fiveButton;
-	UIDigitButton*  sixButton;
-	UIDigitButton*  sevenButton;
-	UIDigitButton*  eightButton;
-	UIDigitButton*  nineButton;
-	UIDigitButton*  starButton;
-	UIDigitButton*  zeroButton;
-	UIDigitButton*  sharpButton;
 }
 
 @property (nonatomic, retain) IBOutlet UIPauseButton*   pauseButton;
@@ -70,18 +44,18 @@
 @property (nonatomic, retain) IBOutlet UIButton*        optionsTransferButton;
 @property (nonatomic, retain) IBOutlet UIToggleButton*  dialerButton;
 
-@property (nonatomic, retain) IBOutlet UIButton* oneButton;
-@property (nonatomic, retain) IBOutlet UIButton* twoButton;
-@property (nonatomic, retain) IBOutlet UIButton* threeButton;
-@property (nonatomic, retain) IBOutlet UIButton* fourButton;
-@property (nonatomic, retain) IBOutlet UIButton* fiveButton;
-@property (nonatomic, retain) IBOutlet UIButton* sixButton;
-@property (nonatomic, retain) IBOutlet UIButton* sevenButton;
-@property (nonatomic, retain) IBOutlet UIButton* eightButton;
-@property (nonatomic, retain) IBOutlet UIButton* nineButton;
-@property (nonatomic, retain) IBOutlet UIButton* starButton;
-@property (nonatomic, retain) IBOutlet UIButton* zeroButton;
-@property (nonatomic, retain) IBOutlet UIButton* sharpButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* oneButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* twoButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* threeButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* fourButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* fiveButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* sixButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* sevenButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* eightButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* nineButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* starButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton;
+@property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton;
 
 - (IBAction)onOptionsClick:(id)sender;
 - (IBAction)onOptionsTransferClick:(id)sender;

Classes/LinphoneUI/UICallButton.h

@@ -21,8 +21,6 @@
 
 
 @interface UICallButton : UIButton {
-@private
-	UITextField* addressField;    
 }
 
 @property (nonatomic, retain) IBOutlet UITextField* addressField;

Classes/LinphoneUI/UICallCell.h

@@ -33,25 +33,6 @@
 @end
 
 @interface UICallCell : UITableViewCell {
-    @private
-    BOOL firstCell;
-    BOOL conferenceCell;
-    BOOL currentCall;
-    
-    UIImageView* headerBackgroundImage;
-    UIImageView* headerBackgroundHighlightImage;
-    
-    UILabel *addressLabel;
-    UILabel *stateLabel;
-    UIImageView *stateImage;
-    UIPauseButton *pauseButton;
-    UIButton *removeButton;
-    UIImageView *avatarImage;
-    
-    UIView *headerView;
-    UIView *avatarView;
-    
-    UICallCellData *data;
 }
 
 @property (nonatomic, retain) UICallCellData *data;

Classes/LinphoneUI/UICallCell.m

@@ -92,7 +92,7 @@
 
 - (void)prepareForReuse {
     [super prepareForReuse];
-    self->currentCall = FALSE;
+    currentCall = FALSE;
     [headerBackgroundHighlightImage setAlpha:0.0f];
     [data release];
     data = nil;

Classes/LinphoneUI/UICamSwitch.h

@@ -21,11 +21,9 @@
 
 
 @interface UICamSwitch : UIButton {
-  
 @private
 	const char* currentCamId;
 	const char* nextCamId;
-	UIView* preview;
 }
 @property (nonatomic, retain) IBOutlet UIView* preview;
 @end

Classes/LinphoneUI/UIChatCell.h

@@ -22,13 +22,6 @@
 #import "ChatModel.h"
 
 @interface UIChatCell : UITableViewCell {
-    UIImageView *avatarImage;
-    UILabel *addressLabel;
-    UILabel *chatContentLabel;
-    UIButton *detailsButton;
-    UIButton *deleteButton;
-    
-    ChatModel *chat;
 }
 
 @property (nonatomic, retain) ChatModel *chat;

Classes/LinphoneUI/UIChatRoomCell.h

@@ -22,14 +22,6 @@
 #import "ChatModel.h"
 
 @interface UIChatRoomCell : UITableViewCell {
-    UIImageView *backgroundImage;
-    UIView *innerView;
-    UIView *messageView;
-    UILabel *messageLabel;
-    UIButton *deleteButton;
-    UILabel *dateLabel;
-    
-    ChatModel *chat;
 }
 
 @property (nonatomic, retain) ChatModel *chat;

Classes/LinphoneUI/UIChatRoomCell.m

@@ -78,7 +78,7 @@ static UIFont *CELL_FONT = nil;
 
 - (void)prepareForReuse {
     [super prepareForReuse];
-    self->chat = nil;
+    chat = nil;
 }
 
 - (void)update {

Classes/LinphoneUI/UICompositeViewController.h

@@ -24,15 +24,6 @@
 #import "TPMultiLayoutViewController.h"
 
 @interface UICompositeViewDescription: NSObject{
-    NSString *name;
-    NSString *content;
-    NSString *stateBar;
-    BOOL stateBarEnabled;
-    NSString *tabBar;
-    BOOL tabBarEnabled;
-    BOOL fullscreen;
-    BOOL landscapeMode;
-    BOOL portraitMode;
 }
 
 @property (retain) NSString *name;
@@ -65,14 +56,8 @@
 
 @interface UICompositeViewController : TPMultiLayoutViewController {
     @private
-    UIView *stateBarView;
-    UIView *contentView;
-    UIView *tabBarView;
-    
     NSMutableDictionary *viewControllerCache;
-    
     UICompositeViewDescription *currentViewDescription;
-    CATransition *viewTransition;
     UIInterfaceOrientation currentOrientation;
 }
 

Classes/LinphoneUI/UICompositeViewController.m

@@ -102,7 +102,7 @@
 #pragma mark - Lifecycle Functions
 
 - (void)initUICompositeViewController {
-    self->viewControllerCache = [[NSMutableDictionary alloc] init];
+    viewControllerCache = [[NSMutableDictionary alloc] init];
     currentOrientation = UIDeviceOrientationUnknown;
 }
 

Classes/LinphoneUI/UIConferenceHeader.h

@@ -22,8 +22,6 @@
 #import "UIPauseButton.h"
 
 @interface UIConferenceHeader : UIViewController {
-    UIImageView *stateImage;
-    UIPauseButton *pauseButton;
 }
 
 @property (nonatomic, retain) IBOutlet UIImageView* stateImage;

Classes/LinphoneUI/UIContactCell.h

@@ -21,10 +21,6 @@
 #import <AddressBook/AddressBook.h>
 
 @interface UIContactCell : UITableViewCell {
-    UILabel *firstNameLabel;
-    UILabel *lastNameLabel;
-    UIImageView *avatarImage;
-    ABRecordRef contact;
 }
 
 @property (nonatomic, retain) IBOutlet UILabel* firstNameLabel;

Classes/LinphoneUI/UIContactDetailsFooter.h

@@ -22,9 +22,6 @@
 #import "ContactDetailsDelegate.h"
 
 @interface UIContactDetailsFooter : UIViewController {
-@private
-    UIButton *removeButton;
-    id<ContactDetailsDelegate> contactDetailsDelegate;
 }
 
 @property (nonatomic, retain) IBOutlet UIButton *removeButton;

Classes/LinphoneUI/UIContactDetailsHeader.h

@@ -24,16 +24,9 @@
 #import "ContactDetailsDelegate.h"
 
 @interface UIContactDetailsHeader : UIViewController<UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate, ContactDetailsImagePickerDelegate> {
-    UILabel *addressLabel;
-    UIImageView *avatarImage;
-    UIView *normalView;
-    UIView *editView;
-    UITableView *tableView;
-    
+    @private
     NSArray *propertyList;
-    ABRecordRef contact;
     BOOL editing;
-    id<ContactDetailsDelegate> contactDetailsDelegate;
 }
 
 @property (nonatomic, assign) ABRecordRef contact;

Classes/LinphoneUI/UIDigitButton.h

@@ -23,10 +23,6 @@
 
 
 @interface UIDigitButton : UILongTouchButton<UILongTouchButtonDelegate> {
-@private
-	char  digit;
-    bool  dtmf;
-	UITextField* addressField;    
 }
 
 @property (nonatomic, retain) IBOutlet UITextField* addressField;

Classes/LinphoneUI/UIDigitButton.m

@@ -31,7 +31,7 @@
 #pragma mark - Lifecycle Functions
 
 - (void)initUIDigitButton {
-    self->dtmf = FALSE;
+    dtmf = FALSE;
 	[self addTarget:self action:@selector(touchDown:) forControlEvents:UIControlEventTouchDown];
 	[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside|UIControlEventTouchUpOutside];
 }

Classes/LinphoneUI/UIEditableTableViewCell.h

@@ -20,7 +20,6 @@
 #import <UIKit/UIKit.h>
 
 @interface UIEditableTableViewCell : UITableViewCell {
-    UITextField *detailTextField;
 }
 
 @property (nonatomic, retain) IBOutlet UITextField *detailTextField;

Classes/LinphoneUI/UIEraseButton.h

@@ -21,9 +21,7 @@
 
 #import "UILongTouchButton.h"
 
-@interface UIEraseButton : UILongTouchButton<UILongTouchButtonDelegate>  {
-@private
-	UITextField* addressField;    
+@interface UIEraseButton : UILongTouchButton<UILongTouchButtonDelegate>  {  
 }
 
 @property (nonatomic, retain) IBOutlet UITextField* addressField;

Classes/LinphoneUI/UIHistoryCell.h

@@ -22,12 +22,6 @@
 #include "linphonecore.h"
 
 @interface UIHistoryCell : UITableViewCell {
-    UIImageView*    imageView;
-    UILabel*        addressLabel;
-    UIButton*       detailsButton;
-    UIButton*       deleteButton;
-    @private
-    LinphoneCallLog *callLog;
 }
 
 @property (nonatomic, assign) LinphoneCallLog *callLog;

Classes/LinphoneUI/UIMainBar.h

@@ -21,15 +21,6 @@
 #import "TPMultiLayoutViewController.h"
 
 @interface UIMainBar : TPMultiLayoutViewController {
-    UIButton *historyButton;
-    UIButton *contactsButton;
-    UIButton *dialerButton;
-    UIButton *settingsButton;
-    UIButton *chatButton;
-    UIView *historyNotificationView;
-    UILabel *historyNotificationLabel;
-    UIView *chatNotificationView;
-    UILabel *chatNotificationLabel;
 }
 
 @property (nonatomic, retain) IBOutlet UIButton* historyButton;

Classes/LinphoneUI/UIPauseButton.m

@@ -29,7 +29,7 @@
 #pragma mark - Lifecycle Functions
 
 - (void)initUIPauseButton {
-    self->type = UIPauseButtonType_CurrentCall;
+    type = UIPauseButtonType_CurrentCall;
 }
 
 - (id)init{
@@ -91,8 +91,8 @@
 #pragma mark - 
 
 - (void)setType:(UIPauseButtonType) atype call:(LinphoneCall*)acall {
-    self->type = atype;
-    self->call = acall;
+    type = atype;
+    call = acall;
 }
 
 

Classes/LinphoneUI/UIStateBar.h

@@ -21,10 +21,6 @@
 #import "TPMultiLayoutViewController.h"
 
 @interface UIStateBar : TPMultiLayoutViewController {
-    UIImageView*    registrationStateImage;
-    UILabel*        registrationStateLabel;
-    UIImageView*    callQualityImage;
-    UIImageView*    callSecurityImage;
 }
 
 @property (nonatomic, retain) IBOutlet UIImageView* registrationStateImage;

Classes/LinphoneUI/UITransferButton.h

@@ -20,8 +20,6 @@
 #import <UIKit/UIKit.h>
 
 @interface UITransferButton : UIButton {
-@private
-	UITextField* addressField;    
 }
 
 @property (nonatomic, retain) IBOutlet UITextField* addressField;

Classes/LinphoneUI/UIVideoButton.h

@@ -22,9 +22,6 @@
 #import "UIToggleButton.h"
 
 @interface UIVideoButton : UIToggleButton<UIToggleButtonDelegate> {
-    BOOL locked;
-    BOOL unlockVideoState;
-    UIActivityIndicatorView *waitView;
 }
 
 @property (assign) BOOL locked;

Classes/LinphoneUI/UIVideoButton.m

@@ -27,8 +27,8 @@
 @synthesize waitView;
 
 - (void)initUIVideoButton {
-    self->locked = FALSE;
-    self->unlockVideoState = FALSE;
+    locked = FALSE;
+    unlockVideoState = FALSE;
 }
 
 - (id)init{

Classes/Model/ChatModel.m

@@ -90,9 +90,9 @@
     }
     
     if([self chatId] != nil) {
-        [self->chatId release];
+        [chatId release];
     } 
-    self->chatId = [[NSNumber alloc] initWithInt:sqlite3_last_insert_rowid(database)];
+    chatId = [[NSNumber alloc] initWithInt:sqlite3_last_insert_rowid(database)];
     sqlite3_finalize(sqlStatement);
 }
 

Classes/MoreViewController.h

@@ -21,16 +21,8 @@
 
 @class ConsoleViewController;
 @interface MoreViewController : UITableViewController {
-
+    @private
 	bool isLogViewEnabled;
-	
-	UITableViewCell *credit;
-	UITextView *creditText;
-
-	UITableViewCell *web;
-	UILabel *weburi;
-	UITableViewCell *console;
-
 	ConsoleViewController *consoleViewController;
 	bool isDebug;
 }

Classes/PhoneMainView.h

@@ -41,13 +41,8 @@
 
 @interface PhoneMainView : UIViewController<CallActionSheetDelegate, IncomingCallViewDelegate> {
     @private
-    UICompositeViewController *mainViewController;
-
     UIActionSheet *batteryActionSheet;
-    
     int loadCount;
-    
-    UICompositeViewDescription *currentView;
     NSMutableArray *viewStack;
 }
 

Classes/PhoneMainView.m

@@ -84,7 +84,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
 
 - (void)viewDidLoad {
     // Avoid IOS 4 bug
-    if(self->loadCount++ > 0)
+    if(loadCount++ > 0)
         return;
     
     [super viewDidLoad];
@@ -160,7 +160,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
     [super viewDidUnload];
 
     // Avoid IOS 4 bug
-    self->loadCount--;
+    loadCount--;
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {

Classes/SettingsViewController.h

@@ -23,8 +23,6 @@
 #import "IASKAppSettingsViewController.h"
 
 @interface SettingsViewController: UIViewController<IASKSettingsDelegate, UICompositeViewDelegate> {
-    IASKAppSettingsViewController *settingsController;
-    UINavigationController *navigationController;
 }
 
 @property (nonatomic, retain) IBOutlet UINavigationController *navigationController;

Classes/Utils/UACellBackgroundView/UACellBackgroundView.m

@@ -21,7 +21,7 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi
 
 - (void)initUACellBackgroundView {
     [super setBackgroundColor:[UIColor clearColor]];
-    self->automaticPositioning = TRUE;
+    automaticPositioning = TRUE;
 }
      
 - (id)init {
@@ -53,10 +53,10 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi
 }
      
 - (void)setBackgroundColor:(UIColor *)abackgroundColor {
-    if(self->backgroundColor != nil) {
-        [self->backgroundColor release];
+    if(backgroundColor != nil) {
+        [backgroundColor release];
     }
-    self->backgroundColor = [[UIColor alloc]initWithCGColor:abackgroundColor.CGColor];
+    backgroundColor = [[UIColor alloc]initWithCGColor:abackgroundColor.CGColor];
     [self setNeedsDisplay];
 }
 

Classes/WizardViewController.h

@@ -22,26 +22,13 @@
 #import "UICompositeViewController.h"
 
 @interface WizardViewController : UIViewController <UITextFieldDelegate, UICompositeViewDelegate, XMLRPCConnectionDelegate> {
-    UIScrollView *contentView;
-    
-    UIView *welcomeView;
-    UIView *choiceView;
-    UIView *createAccountView;
-    UIView *connectAccountView;
-    UIView *externalAccountView;
-    UIView *validateAccountView;
-    
-    UIView *waitView;
-    UIView *currentView;
+    @private
     UITextField *activeTextField;
-    
-    UIButton *backButton;
-    UIButton *startButton;
-    
+    UIView *currentView;
     NSMutableArray *historyViews;
 }
 
-@property (nonatomic, retain) IBOutlet UIView *contentView;
+@property (nonatomic, retain) IBOutlet UIScrollView *contentView;
 
 @property (nonatomic, retain) IBOutlet UIView *welcomeView;
 @property (nonatomic, retain) IBOutlet UIView *choiceView;