From f40deac05cc7bf9e2b1478ffccedf1c1e494ea55 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 1 Dec 2015 11:46:06 +0100 Subject: [PATCH] Classes: fix compilation of checkboxtv --- Classes/ChatConversationTableView.h | 4 ++-- Classes/ChatsListTableView.h | 4 ++-- Classes/ContactsListTableView.h | 4 ++-- Classes/HistoryListTableView.h | 4 ++-- Classes/LinphoneUI/UICheckBoxTableView.h | 2 +- Classes/LinphoneUI/UICheckBoxTableView.m | 4 ++-- linphone.xcodeproj/project.pbxproj | 12 ++++++------ 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Classes/ChatConversationTableView.h b/Classes/ChatConversationTableView.h index dd8c95d45..a4b376d49 100644 --- a/Classes/ChatConversationTableView.h +++ b/Classes/ChatConversationTableView.h @@ -20,7 +20,7 @@ #import #include "linphone/linphonecore.h" -#import "UICheckBoxTableViewController.h" +#import "UICheckBoxTableView.h" @protocol ChatConversationDelegate @@ -29,7 +29,7 @@ @end -@interface ChatConversationTableView : UICheckBoxTableViewController { +@interface ChatConversationTableView : UICheckBoxTableView { @private LinphoneChatRoom *chatRoom; MSList *messageList; diff --git a/Classes/ChatsListTableView.h b/Classes/ChatsListTableView.h index 5641b117f..9754a4f99 100644 --- a/Classes/ChatsListTableView.h +++ b/Classes/ChatsListTableView.h @@ -19,9 +19,9 @@ #import #include "linphone/linphonecore.h" -#include "UICheckBoxTableViewController.h" +#include "UICheckBoxTableView.h" -@interface ChatsListTableView : UICheckBoxTableViewController +@interface ChatsListTableView : UICheckBoxTableView - (void)loadData; @end diff --git a/Classes/ContactsListTableView.h b/Classes/ContactsListTableView.h index db11afe3a..135479ec2 100644 --- a/Classes/ContactsListTableView.h +++ b/Classes/ContactsListTableView.h @@ -20,11 +20,11 @@ #import #import -#import "UICheckBoxTableViewController.h" +#import "UICheckBoxTableView.h" #import "OrderedDictionary.h" -@interface ContactsListTableView : UICheckBoxTableViewController { +@interface ContactsListTableView : UICheckBoxTableView { @private OrderedDictionary *addressBookMap; NSMutableDictionary *avatarMap; diff --git a/Classes/HistoryListTableView.h b/Classes/HistoryListTableView.h index d9e7fa40c..1285997be 100644 --- a/Classes/HistoryListTableView.h +++ b/Classes/HistoryListTableView.h @@ -19,9 +19,9 @@ #import -#import "UICheckBoxTableViewController.h" +#import "UICheckBoxTableView.h" -@interface HistoryListTableView : UICheckBoxTableViewController { +@interface HistoryListTableView : UICheckBoxTableView { } @property(nonatomic, assign) BOOL missedFilter; diff --git a/Classes/LinphoneUI/UICheckBoxTableView.h b/Classes/LinphoneUI/UICheckBoxTableView.h index 19630f714..692a30199 100644 --- a/Classes/LinphoneUI/UICheckBoxTableView.h +++ b/Classes/LinphoneUI/UICheckBoxTableView.h @@ -10,7 +10,7 @@ #import -@interface UICheckBoxTableViewController : UITableViewController +@interface UICheckBoxTableView : UITableViewController @property(nonatomic, readonly) NSMutableArray *selectedItems; @property(weak, nonatomic) IBOutlet UIButton *deleteButton; diff --git a/Classes/LinphoneUI/UICheckBoxTableView.m b/Classes/LinphoneUI/UICheckBoxTableView.m index 6a3779b87..4a631f02b 100644 --- a/Classes/LinphoneUI/UICheckBoxTableView.m +++ b/Classes/LinphoneUI/UICheckBoxTableView.m @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#import "UICheckBoxTableViewController.h" +#import "UICheckBoxTableView.h" #import "Utils.h" -@implementation UICheckBoxTableViewController +@implementation UICheckBoxTableView - (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 48f115267..f1287bf51 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -92,7 +92,6 @@ 6334DDFB1BBAC99400631900 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; }; 6334DDFC1BBAC99B00631900 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22351B15E889008C0621 /* libxml2.dylib */; }; 6334DDFD1BBAC9A200631900 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F0B026F21AA710AF00FF49F7 /* libiconv.dylib */; }; - 6334DE001BBAD5AA00631900 /* UICheckBoxTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334DDFF1BBAD5AA00631900 /* UICheckBoxTableViewController.m */; }; 633671611BCBAAD200BFCBDE /* ChatConversationCreateView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6336715F1BCBAAD200BFCBDE /* ChatConversationCreateView.m */; }; 633756391B67BAF400E21BAD /* SideMenuTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 633756381B67BAF400E21BAD /* SideMenuTableView.m */; }; 633756451B67D2B200E21BAD /* SideMenuView.m in Sources */ = {isa = PBXBuildFile; fileRef = 633756431B67D2B100E21BAD /* SideMenuView.m */; }; @@ -481,6 +480,7 @@ 639CEB001A1DF4E4004DE38F /* UIHistoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB021A1DF4E4004DE38F /* UIHistoryCell.xib */; }; 639CEB031A1DF4EB004DE38F /* UICompositeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB051A1DF4EB004DE38F /* UICompositeView.xib */; }; 639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB0B1A1DF4FA004DE38F /* UIChatCell.xib */; }; + 639E9C801C0DB13D00019A75 /* UICheckBoxTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 639E9C7F1C0DB13D00019A75 /* UICheckBoxTableView.m */; }; 63AADBE81B6A0FF200AA16FD /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBC41B6A0FF200AA16FD /* Localizable.strings */; }; 63AADBE91B6A0FF200AA16FD /* hold.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBC91B6A0FF200AA16FD /* hold.wav */; }; 63AADBEA1B6A0FF200AA16FD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBCA1B6A0FF200AA16FD /* Images.xcassets */; }; @@ -898,8 +898,6 @@ 631348311B6FA53300C6BDCB /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = "liblinphone-sdk/apple-darwin/share/linphone/rootca.pem"; sourceTree = SOURCE_ROOT; }; 6316FA6B1BE12A3E0050E441 /* UIRightImageButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIRightImageButton.h; sourceTree = ""; }; 6316FA6C1BE12A3E0050E441 /* UIRightImageButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIRightImageButton.m; sourceTree = ""; }; - 6334DDFE1BBAD5AA00631900 /* UICheckBoxTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICheckBoxTableViewController.h; sourceTree = ""; }; - 6334DDFF1BBAD5AA00631900 /* UICheckBoxTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICheckBoxTableViewController.m; sourceTree = ""; }; 6336715E1BCBAAD200BFCBDE /* ChatConversationCreateView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatConversationCreateView.h; sourceTree = ""; }; 6336715F1BCBAAD200BFCBDE /* ChatConversationCreateView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatConversationCreateView.m; sourceTree = ""; }; 633756371B67BAF400E21BAD /* SideMenuTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SideMenuTableView.h; sourceTree = ""; }; @@ -1306,6 +1304,8 @@ 639CEB011A1DF4E4004DE38F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIHistoryCell.xib; sourceTree = ""; }; 639CEB041A1DF4EB004DE38F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICompositeView.xib; sourceTree = ""; }; 639CEB0A1A1DF4FA004DE38F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIChatCell.xib; sourceTree = ""; }; + 639E9C7E1C0DB13D00019A75 /* UICheckBoxTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICheckBoxTableView.h; sourceTree = ""; }; + 639E9C7F1C0DB13D00019A75 /* UICheckBoxTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICheckBoxTableView.m; sourceTree = ""; }; 63AADBC51B6A0FF200AA16FD /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; }; 63AADBC61B6A0FF200AA16FD /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; 63AADBC71B6A0FF200AA16FD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; @@ -1876,8 +1876,8 @@ 63B8D69F1BCBF43100C12B09 /* UIChatCreateCell.h */, 63B8D6A01BCBF43100C12B09 /* UIChatCreateCell.m */, 63B8D6A11BCBF43100C12B09 /* UIChatCreateCell.xib */, - 6334DDFE1BBAD5AA00631900 /* UICheckBoxTableViewController.h */, - 6334DDFF1BBAD5AA00631900 /* UICheckBoxTableViewController.m */, + 639E9C7E1C0DB13D00019A75 /* UICheckBoxTableView.h */, + 639E9C7F1C0DB13D00019A75 /* UICheckBoxTableView.m */, D31B4B1E159876C0002E6C72 /* UICompositeView.h */, D31B4B1F159876C0002E6C72 /* UICompositeView.m */, 639CEB051A1DF4EB004DE38F /* UICompositeView.xib */, @@ -3466,12 +3466,12 @@ D3807FC515C28940005BE9BC /* DCRoundSwitchToggleLayer.m in Sources */, D3807FE815C2894A005BE9BC /* IASKAppSettingsViewController.m in Sources */, D3807FEA15C2894A005BE9BC /* IASKAppSettingsWebViewController.m in Sources */, - 6334DE001BBAD5AA00631900 /* UICheckBoxTableViewController.m in Sources */, D3807FEC15C2894A005BE9BC /* IASKSpecifierValuesViewController.m in Sources */, D3807FEE15C2894A005BE9BC /* IASKSettingsReader.m in Sources */, D3807FF015C2894A005BE9BC /* IASKSettingsStore.m in Sources */, D3807FF215C2894A005BE9BC /* IASKSettingsStoreFile.m in Sources */, D3807FF415C2894A005BE9BC /* IASKSettingsStoreUserDefaults.m in Sources */, + 639E9C801C0DB13D00019A75 /* UICheckBoxTableView.m in Sources */, D3807FF615C2894A005BE9BC /* IASKSpecifier.m in Sources */, D3807FF815C2894A005BE9BC /* IASKPSSliderSpecifierViewCell.m in Sources */, D3807FFA15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m in Sources */,