From 046962fd065bed7bd1ff5f4c4d5d485ccf9d6b59 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 20 Aug 2012 13:22:54 +0200 Subject: [PATCH] Remove useless variables (with property defined) --- Classes/ChatRoomTableViewController.h | 1 - Classes/ChatRoomViewController.h | 11 +--- Classes/ChatViewController.h | 2 - Classes/ConsoleViewController.h | 2 - Classes/ContactDetailsImagePickerController.h | 2 - Classes/ContactDetailsLabelViewController.h | 4 -- Classes/ContactDetailsLabelViewController.m | 7 +-- Classes/ContactDetailsTableViewController.h | 4 -- Classes/ContactDetailsTableViewController.m | 2 +- Classes/ContactDetailsViewController.h | 6 --- Classes/ContactDetailsViewController.m | 30 +++++------ Classes/ContactsTableViewController.h | 1 + Classes/ContactsViewController.h | 7 --- Classes/DialerViewController.h | 49 +++++------------- Classes/FirstLoginViewController.h | 5 -- Classes/HistoryDetailsViewController.h | 12 +---- Classes/HistoryTableViewController.h | 1 - Classes/HistoryTableViewController.m | 5 +- Classes/HistoryViewController.h | 7 --- Classes/InCallTableViewController.m | 2 +- Classes/InCallViewController.h | 17 +------ Classes/IncomingCallViewController.h | 5 -- Classes/LinphoneManager.h | 9 ---- Classes/LinphoneUI/UICallBar.h | 50 +++++-------------- Classes/LinphoneUI/UICallButton.h | 2 - Classes/LinphoneUI/UICallCell.h | 19 ------- Classes/LinphoneUI/UICallCell.m | 2 +- Classes/LinphoneUI/UICamSwitch.h | 2 - Classes/LinphoneUI/UIChatCell.h | 7 --- Classes/LinphoneUI/UIChatRoomCell.h | 8 --- Classes/LinphoneUI/UIChatRoomCell.m | 2 +- .../LinphoneUI/UICompositeViewController.h | 15 ------ .../LinphoneUI/UICompositeViewController.m | 2 +- Classes/LinphoneUI/UIConferenceHeader.h | 2 - Classes/LinphoneUI/UIContactCell.h | 4 -- Classes/LinphoneUI/UIContactDetailsFooter.h | 3 -- Classes/LinphoneUI/UIContactDetailsHeader.h | 9 +--- Classes/LinphoneUI/UIDigitButton.h | 4 -- Classes/LinphoneUI/UIDigitButton.m | 2 +- Classes/LinphoneUI/UIEditableTableViewCell.h | 1 - Classes/LinphoneUI/UIEraseButton.h | 4 +- Classes/LinphoneUI/UIHistoryCell.h | 6 --- Classes/LinphoneUI/UIMainBar.h | 9 ---- Classes/LinphoneUI/UIPauseButton.m | 6 +-- Classes/LinphoneUI/UIStateBar.h | 4 -- Classes/LinphoneUI/UITransferButton.h | 2 - Classes/LinphoneUI/UIVideoButton.h | 3 -- Classes/LinphoneUI/UIVideoButton.m | 4 +- Classes/Model/ChatModel.m | 4 +- Classes/MoreViewController.h | 10 +--- Classes/PhoneMainView.h | 5 -- Classes/PhoneMainView.m | 4 +- Classes/SettingsViewController.h | 2 - .../UACellBackgroundView.m | 8 +-- Classes/WizardViewController.h | 19 ++----- 55 files changed, 76 insertions(+), 339 deletions(-) diff --git a/Classes/ChatRoomTableViewController.h b/Classes/ChatRoomTableViewController.h index 1a0e3256c..e36041750 100644 --- a/Classes/ChatRoomTableViewController.h +++ b/Classes/ChatRoomTableViewController.h @@ -24,7 +24,6 @@ @interface ChatRoomTableViewController : UITableViewController { @private NSMutableArray *data; - NSString *remoteAddress; } @property (nonatomic, retain) NSString *remoteAddress; diff --git a/Classes/ChatRoomViewController.h b/Classes/ChatRoomViewController.h index 03ac04c83..350aede1c 100644 --- a/Classes/ChatRoomViewController.h +++ b/Classes/ChatRoomViewController.h @@ -27,17 +27,8 @@ #include "linphonecore.h" @interface ChatRoomViewController : UIViewController { - ChatRoomTableViewController *tableController; - UITextField *messageField; - UIButton *sendButton; - NSString *remoteAddress; - UIToggleButton *editButton; + @private LinphoneChatRoom *chatRoom; - UILabel *addressLabel; - UIImageView *avatarImage; - UIView *headerView; - UIView *footerView; - UIImageView *fieldBackgroundImage; } diff --git a/Classes/ChatViewController.h b/Classes/ChatViewController.h index 999fcfb6f..17f56d4db 100644 --- a/Classes/ChatViewController.h +++ b/Classes/ChatViewController.h @@ -25,8 +25,6 @@ #import "UICompositeViewController.h" @interface ChatViewController : UIViewController { - ChatTableViewController *tableController; - UIToggleButton *editButton; } @property (nonatomic, retain) IBOutlet ChatTableViewController* tableController; diff --git a/Classes/ConsoleViewController.h b/Classes/ConsoleViewController.h index 5ae2f3a28..2512b8251 100644 --- a/Classes/ConsoleViewController.h +++ b/Classes/ConsoleViewController.h @@ -22,8 +22,6 @@ #import "LogView.h" @interface ConsoleViewController : UIViewController { - UITextView* logs; - UIView* logsView; } -(void) doAction; diff --git a/Classes/ContactDetailsImagePickerController.h b/Classes/ContactDetailsImagePickerController.h index eea057bf5..3e0fcff72 100644 --- a/Classes/ContactDetailsImagePickerController.h +++ b/Classes/ContactDetailsImagePickerController.h @@ -26,8 +26,6 @@ @end @interface ContactDetailsImagePickerController : UIImagePickerController { -@private - id imagePickerDelegate; } @property (nonatomic, retain) id imagePickerDelegate; diff --git a/Classes/ContactDetailsLabelViewController.h b/Classes/ContactDetailsLabelViewController.h index f67e4a253..b03ecb175 100644 --- a/Classes/ContactDetailsLabelViewController.h +++ b/Classes/ContactDetailsLabelViewController.h @@ -27,10 +27,6 @@ @end @interface ContactDetailsLabelViewController : UIViewController { - NSDictionary *dataList; - UITableView *tableView; - NSString *selectedData; - id delegate; } @property (nonatomic, copy) NSString *selectedData; diff --git a/Classes/ContactDetailsLabelViewController.m b/Classes/ContactDetailsLabelViewController.m index c63b70abf..88b42e134 100644 --- a/Classes/ContactDetailsLabelViewController.m +++ b/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]; } diff --git a/Classes/ContactDetailsTableViewController.h b/Classes/ContactDetailsTableViewController.h index 978007841..9d59e805b 100644 --- a/Classes/ContactDetailsTableViewController.h +++ b/Classes/ContactDetailsTableViewController.h @@ -27,13 +27,9 @@ @interface ContactDetailsTableViewController : UITableViewController { @private - ABRecordRef contact; NSMutableArray *dataCache; NSMutableArray *labelArray; NSIndexPath *editingIndexPath; - UIContactDetailsHeader *headerController; - UIContactDetailsFooter *footerController; - id contactDetailsDelegate; } @property (nonatomic, assign) ABRecordRef contact; diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 784efef47..994497c0a 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/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]; } diff --git a/Classes/ContactDetailsViewController.h b/Classes/ContactDetailsViewController.h index 5e1f159ed..cc445a0c3 100644 --- a/Classes/ContactDetailsViewController.h +++ b/Classes/ContactDetailsViewController.h @@ -25,12 +25,6 @@ #import "ContactDetailsTableViewController.h" @interface ContactDetailsViewController : UIViewController { - ContactDetailsTableViewController *tableController; - ABRecordRef contact; - UIToggleButton *editButton; - UIButton *backButton; - UIButton *cancelButton; - ABAddressBookRef addressBook; BOOL inhibUpdate; } diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m index 14fdb70f4..d8cac2053 100644 --- a/Classes/ContactDetailsViewController.m +++ b/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]; } diff --git a/Classes/ContactsTableViewController.h b/Classes/ContactsTableViewController.h index fa63b5fbd..d1cbd99a0 100644 --- a/Classes/ContactsTableViewController.h +++ b/Classes/ContactsTableViewController.h @@ -23,6 +23,7 @@ #import "OrderedDictionary.h" @interface ContactsTableViewController : UITableViewController { + @private OrderedDictionary* addressBookMap; NSMutableDictionary* avatarMap; diff --git a/Classes/ContactsViewController.h b/Classes/ContactsViewController.h index 2b14e492c..0c8fc791c 100644 --- a/Classes/ContactsViewController.h +++ b/Classes/ContactsViewController.h @@ -42,13 +42,6 @@ typedef enum _ContactSelectionMode { @end @interface ContactsViewController : UIViewController { - ContactsTableViewController *tableController; - UITableView *tableView; - - UIButton *allButton; - UIButton *linphoneButton; - UIButton *backButton; - UIButton *addButton; } @property (nonatomic, retain) IBOutlet ContactsTableViewController* tableController; diff --git a/Classes/DialerViewController.h b/Classes/DialerViewController.h index 876541100..ef088b355 100644 --- a/Classes/DialerViewController.h +++ b/Classes/DialerViewController.h @@ -27,31 +27,6 @@ #import "UIDigitButton.h" @interface DialerViewController : UIViewController { -@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; diff --git a/Classes/FirstLoginViewController.h b/Classes/FirstLoginViewController.h index 5f9961cbf..44e022547 100644 --- a/Classes/FirstLoginViewController.h +++ b/Classes/FirstLoginViewController.h @@ -22,11 +22,6 @@ #import "UICompositeViewController.h" @interface FirstLoginViewController : UIViewController { - UIButton* loginButton; - UIButton* siteButton; - UITextField* usernameField; - UITextField* passwordField; - UIView* waitView; } - (IBAction)onLoginClick:(id)sender; diff --git a/Classes/HistoryDetailsViewController.h b/Classes/HistoryDetailsViewController.h index 14da3917b..df6ffac34 100644 --- a/Classes/HistoryDetailsViewController.h +++ b/Classes/HistoryDetailsViewController.h @@ -24,17 +24,7 @@ #import "UICompositeViewController.h" @interface HistoryDetailsViewController : UIViewController { - 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; diff --git a/Classes/HistoryTableViewController.h b/Classes/HistoryTableViewController.h index 9b2dc7aef..6214a3b4f 100644 --- a/Classes/HistoryTableViewController.h +++ b/Classes/HistoryTableViewController.h @@ -21,7 +21,6 @@ @interface HistoryTableViewController : UITableViewController { @private - BOOL missedFilter; NSMutableArray *callLogs; } diff --git a/Classes/HistoryTableViewController.m b/Classes/HistoryTableViewController.m index ad0c33234..b14825271 100644 --- a/Classes/HistoryTableViewController.m +++ b/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]; } diff --git a/Classes/HistoryViewController.h b/Classes/HistoryViewController.h index 93025f1b7..5f21f6a0e 100644 --- a/Classes/HistoryViewController.h +++ b/Classes/HistoryViewController.h @@ -24,13 +24,6 @@ #import "UIToggleButton.h" @interface HistoryViewController : UIViewController { - @private - HistoryTableViewController *tableController; - UITableView *tableView; - - UIButton *allButton; - UIButton *missedButton; - UIToggleButton *editButton; } @property (nonatomic, retain) IBOutlet HistoryTableViewController* tableController; diff --git a/Classes/InCallTableViewController.m b/Classes/InCallTableViewController.m index 66956f91a..4b21b862f 100644 --- a/Classes/InCallTableViewController.m +++ b/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{ diff --git a/Classes/InCallViewController.h b/Classes/InCallViewController.h index 46055e52b..d9df2a3b7 100644 --- a/Classes/InCallViewController.h +++ b/Classes/InCallViewController.h @@ -29,26 +29,11 @@ @class VideoViewController; @interface InCallViewController : UIViewController { - - 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; } diff --git a/Classes/IncomingCallViewController.h b/Classes/IncomingCallViewController.h index cea938b97..a9829e07a 100644 --- a/Classes/IncomingCallViewController.h +++ b/Classes/IncomingCallViewController.h @@ -31,11 +31,6 @@ @end @interface IncomingCallViewController : UIViewController { -@private - UILabel* addressLabel; - UIImageView* avatarImage; - LinphoneCall *call; - id delegate; } @property (nonatomic, retain) IBOutlet UILabel* addressLabel; diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 34bcabc3c..997ee7c45 100644 --- a/Classes/LinphoneManager.h +++ b/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 settingsStore; - sqlite3 *database; - @public CallContext currentCallContextBeforeGoingBackground; diff --git a/Classes/LinphoneUI/UICallBar.h b/Classes/LinphoneUI/UICallBar.h index 580fa2751..d328c2173 100644 --- a/Classes/LinphoneUI/UICallBar.h +++ b/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; diff --git a/Classes/LinphoneUI/UICallButton.h b/Classes/LinphoneUI/UICallButton.h index 955d9a4ee..d8b317a1d 100644 --- a/Classes/LinphoneUI/UICallButton.h +++ b/Classes/LinphoneUI/UICallButton.h @@ -21,8 +21,6 @@ @interface UICallButton : UIButton { -@private - UITextField* addressField; } @property (nonatomic, retain) IBOutlet UITextField* addressField; diff --git a/Classes/LinphoneUI/UICallCell.h b/Classes/LinphoneUI/UICallCell.h index f183a81b6..3cf7e27b6 100644 --- a/Classes/LinphoneUI/UICallCell.h +++ b/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; diff --git a/Classes/LinphoneUI/UICallCell.m b/Classes/LinphoneUI/UICallCell.m index 0c863581b..92b32c186 100644 --- a/Classes/LinphoneUI/UICallCell.m +++ b/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; diff --git a/Classes/LinphoneUI/UICamSwitch.h b/Classes/LinphoneUI/UICamSwitch.h index a3927bf17..3110b0e71 100644 --- a/Classes/LinphoneUI/UICamSwitch.h +++ b/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 diff --git a/Classes/LinphoneUI/UIChatCell.h b/Classes/LinphoneUI/UIChatCell.h index 126310b04..7d7a1d7cf 100644 --- a/Classes/LinphoneUI/UIChatCell.h +++ b/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; diff --git a/Classes/LinphoneUI/UIChatRoomCell.h b/Classes/LinphoneUI/UIChatRoomCell.h index 7bbb46af9..503fffe66 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.h +++ b/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; diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index e9351809d..08d5ce136 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -78,7 +78,7 @@ static UIFont *CELL_FONT = nil; - (void)prepareForReuse { [super prepareForReuse]; - self->chat = nil; + chat = nil; } - (void)update { diff --git a/Classes/LinphoneUI/UICompositeViewController.h b/Classes/LinphoneUI/UICompositeViewController.h index 8a64479d3..a401e68ad 100644 --- a/Classes/LinphoneUI/UICompositeViewController.h +++ b/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; } diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 2b18de7c1..7de90348a 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/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; } diff --git a/Classes/LinphoneUI/UIConferenceHeader.h b/Classes/LinphoneUI/UIConferenceHeader.h index 22b87cfaa..5834c78ae 100644 --- a/Classes/LinphoneUI/UIConferenceHeader.h +++ b/Classes/LinphoneUI/UIConferenceHeader.h @@ -22,8 +22,6 @@ #import "UIPauseButton.h" @interface UIConferenceHeader : UIViewController { - UIImageView *stateImage; - UIPauseButton *pauseButton; } @property (nonatomic, retain) IBOutlet UIImageView* stateImage; diff --git a/Classes/LinphoneUI/UIContactCell.h b/Classes/LinphoneUI/UIContactCell.h index e9f5a7b01..c94782949 100644 --- a/Classes/LinphoneUI/UIContactCell.h +++ b/Classes/LinphoneUI/UIContactCell.h @@ -21,10 +21,6 @@ #import @interface UIContactCell : UITableViewCell { - UILabel *firstNameLabel; - UILabel *lastNameLabel; - UIImageView *avatarImage; - ABRecordRef contact; } @property (nonatomic, retain) IBOutlet UILabel* firstNameLabel; diff --git a/Classes/LinphoneUI/UIContactDetailsFooter.h b/Classes/LinphoneUI/UIContactDetailsFooter.h index 08b14b850..79496261f 100644 --- a/Classes/LinphoneUI/UIContactDetailsFooter.h +++ b/Classes/LinphoneUI/UIContactDetailsFooter.h @@ -22,9 +22,6 @@ #import "ContactDetailsDelegate.h" @interface UIContactDetailsFooter : UIViewController { -@private - UIButton *removeButton; - id contactDetailsDelegate; } @property (nonatomic, retain) IBOutlet UIButton *removeButton; diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.h b/Classes/LinphoneUI/UIContactDetailsHeader.h index 79cb1dd1b..a9279f002 100644 --- a/Classes/LinphoneUI/UIContactDetailsHeader.h +++ b/Classes/LinphoneUI/UIContactDetailsHeader.h @@ -24,16 +24,9 @@ #import "ContactDetailsDelegate.h" @interface UIContactDetailsHeader : UIViewController { - UILabel *addressLabel; - UIImageView *avatarImage; - UIView *normalView; - UIView *editView; - UITableView *tableView; - + @private NSArray *propertyList; - ABRecordRef contact; BOOL editing; - id contactDetailsDelegate; } @property (nonatomic, assign) ABRecordRef contact; diff --git a/Classes/LinphoneUI/UIDigitButton.h b/Classes/LinphoneUI/UIDigitButton.h index 65f2d20a5..4b7d9f0e4 100644 --- a/Classes/LinphoneUI/UIDigitButton.h +++ b/Classes/LinphoneUI/UIDigitButton.h @@ -23,10 +23,6 @@ @interface UIDigitButton : UILongTouchButton { -@private - char digit; - bool dtmf; - UITextField* addressField; } @property (nonatomic, retain) IBOutlet UITextField* addressField; diff --git a/Classes/LinphoneUI/UIDigitButton.m b/Classes/LinphoneUI/UIDigitButton.m index dcafad7b6..3f84c0ee6 100644 --- a/Classes/LinphoneUI/UIDigitButton.m +++ b/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]; } diff --git a/Classes/LinphoneUI/UIEditableTableViewCell.h b/Classes/LinphoneUI/UIEditableTableViewCell.h index 5549da4b0..d4ac998c5 100644 --- a/Classes/LinphoneUI/UIEditableTableViewCell.h +++ b/Classes/LinphoneUI/UIEditableTableViewCell.h @@ -20,7 +20,6 @@ #import @interface UIEditableTableViewCell : UITableViewCell { - UITextField *detailTextField; } @property (nonatomic, retain) IBOutlet UITextField *detailTextField; diff --git a/Classes/LinphoneUI/UIEraseButton.h b/Classes/LinphoneUI/UIEraseButton.h index 0e9e2af51..7baced2e6 100644 --- a/Classes/LinphoneUI/UIEraseButton.h +++ b/Classes/LinphoneUI/UIEraseButton.h @@ -21,9 +21,7 @@ #import "UILongTouchButton.h" -@interface UIEraseButton : UILongTouchButton { -@private - UITextField* addressField; +@interface UIEraseButton : UILongTouchButton { } @property (nonatomic, retain) IBOutlet UITextField* addressField; diff --git a/Classes/LinphoneUI/UIHistoryCell.h b/Classes/LinphoneUI/UIHistoryCell.h index 2ce131462..574f84484 100644 --- a/Classes/LinphoneUI/UIHistoryCell.h +++ b/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; diff --git a/Classes/LinphoneUI/UIMainBar.h b/Classes/LinphoneUI/UIMainBar.h index 210247659..7038ba394 100644 --- a/Classes/LinphoneUI/UIMainBar.h +++ b/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; diff --git a/Classes/LinphoneUI/UIPauseButton.m b/Classes/LinphoneUI/UIPauseButton.m index d7d747961..ed6b962b6 100644 --- a/Classes/LinphoneUI/UIPauseButton.m +++ b/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; } diff --git a/Classes/LinphoneUI/UIStateBar.h b/Classes/LinphoneUI/UIStateBar.h index 5d0806b0d..a2f075a19 100644 --- a/Classes/LinphoneUI/UIStateBar.h +++ b/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; diff --git a/Classes/LinphoneUI/UITransferButton.h b/Classes/LinphoneUI/UITransferButton.h index f6178358e..451ff75d4 100644 --- a/Classes/LinphoneUI/UITransferButton.h +++ b/Classes/LinphoneUI/UITransferButton.h @@ -20,8 +20,6 @@ #import @interface UITransferButton : UIButton { -@private - UITextField* addressField; } @property (nonatomic, retain) IBOutlet UITextField* addressField; diff --git a/Classes/LinphoneUI/UIVideoButton.h b/Classes/LinphoneUI/UIVideoButton.h index fbd07c43f..759911f00 100644 --- a/Classes/LinphoneUI/UIVideoButton.h +++ b/Classes/LinphoneUI/UIVideoButton.h @@ -22,9 +22,6 @@ #import "UIToggleButton.h" @interface UIVideoButton : UIToggleButton { - BOOL locked; - BOOL unlockVideoState; - UIActivityIndicatorView *waitView; } @property (assign) BOOL locked; diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m index 6de7c2842..2368b9bfa 100644 --- a/Classes/LinphoneUI/UIVideoButton.m +++ b/Classes/LinphoneUI/UIVideoButton.m @@ -27,8 +27,8 @@ @synthesize waitView; - (void)initUIVideoButton { - self->locked = FALSE; - self->unlockVideoState = FALSE; + locked = FALSE; + unlockVideoState = FALSE; } - (id)init{ diff --git a/Classes/Model/ChatModel.m b/Classes/Model/ChatModel.m index 88eec26d8..a216cdd8d 100644 --- a/Classes/Model/ChatModel.m +++ b/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); } diff --git a/Classes/MoreViewController.h b/Classes/MoreViewController.h index 896a3a003..589c2dbaf 100644 --- a/Classes/MoreViewController.h +++ b/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; } diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index b79f53403..a80b60d92 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -41,13 +41,8 @@ @interface PhoneMainView : UIViewController { @private - UICompositeViewController *mainViewController; - UIActionSheet *batteryActionSheet; - int loadCount; - - UICompositeViewDescription *currentView; NSMutableArray *viewStack; } diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 390201f3d..60514b27a 100644 --- a/Classes/PhoneMainView.m +++ b/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 { diff --git a/Classes/SettingsViewController.h b/Classes/SettingsViewController.h index b85da7838..9cc04a88e 100644 --- a/Classes/SettingsViewController.h +++ b/Classes/SettingsViewController.h @@ -23,8 +23,6 @@ #import "IASKAppSettingsViewController.h" @interface SettingsViewController: UIViewController { - IASKAppSettingsViewController *settingsController; - UINavigationController *navigationController; } @property (nonatomic, retain) IBOutlet UINavigationController *navigationController; diff --git a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m index 1f8aa8e14..16e7a144f 100644 --- a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m +++ b/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]; } diff --git a/Classes/WizardViewController.h b/Classes/WizardViewController.h index bbb3fc9a7..f0e8f2b99 100644 --- a/Classes/WizardViewController.h +++ b/Classes/WizardViewController.h @@ -22,26 +22,13 @@ #import "UICompositeViewController.h" @interface WizardViewController : UIViewController { - 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;