From 45f07ab466416d4fd3475dcdafca292e377f045b Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 23 Nov 2017 16:09:19 +0100 Subject: [PATCH] Make code compatible with `!use_frameworks` in Podfile --- Riot/API/RageShakeManager.m | 2 +- Riot/AppDelegate.m | 6 +----- Riot/Model/Room/RoomBubbleCellData.h | 2 +- Riot/Model/Room/RoomPreviewData.h | 2 +- Riot/Model/RoomList/HomeMessagesSearchDataSource.m | 2 ++ Riot/Model/RoomList/RecentCellData.h | 3 ++- Riot/Utils/Widgets/WidgetManager.m | 2 +- Riot/ViewController/MediaPickerViewController.m | 2 +- Riot/ViewController/RecentsViewController.m | 2 +- Riot/ViewController/SettingsViewController.m | 4 ++-- Riot/Views/Contact/ContactTableViewCell.m | 2 +- Riot/Views/Directory/DirectoryServerTableViewCell.h | 2 -- Riot/Views/MediaAlbum/MediaAlbumTableCell.h | 2 +- .../Views/RoomBubbleList/RoomIncomingAttachmentBubbleCell.h | 2 +- .../RoomIncomingAttachmentWithPaginationTitleBubbleCell.h | 2 +- .../RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h | 2 +- Riot/Views/RoomBubbleList/RoomIncomingTextMsgBubbleCell.h | 2 +- .../RoomIncomingTextMsgWithPaginationTitleBubbleCell.h | 2 +- .../RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h | 2 +- .../Views/RoomBubbleList/RoomOutgoingAttachmentBubbleCell.h | 2 +- .../RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h | 2 +- Riot/Views/RoomBubbleList/RoomOutgoingTextMsgBubbleCell.h | 2 +- .../RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h | 2 +- Riot/Views/RoomInputToolbar/KeyboardGrowingTextView.m | 2 +- .../Views/Search/MessagesSearchResultAttachmentBubbleCell.h | 2 +- Riot/Views/Search/MessagesSearchResultTextMsgBubbleCell.h | 2 +- Riot/Views/TableViewCell/TableViewCellWithButton.h | 4 ++-- .../Views/TableViewCell/TableViewCellWithCheckBoxAndLabel.h | 2 +- Riot/Views/TableViewCell/TableViewCellWithCheckBoxes.h | 4 ++-- .../TableViewCell/TableViewCellWithLabelAndLargeTextView.h | 4 ++-- RiotShareExtension/Model/ShareExtensionManager.m | 2 +- RiotShareExtension/ViewController/RoomsListViewController.m | 3 +-- SiriIntents/IntentHandler.m | 6 +----- 33 files changed, 38 insertions(+), 46 deletions(-) diff --git a/Riot/API/RageShakeManager.m b/Riot/API/RageShakeManager.m index ecdb84503..5b93e5cee 100644 --- a/Riot/API/RageShakeManager.m +++ b/Riot/API/RageShakeManager.m @@ -22,7 +22,7 @@ #import "AppDelegate.h" #import "BugReportViewController.h" -#import "NSBundle+MatrixKit.h" +#import static RageShakeManager* sharedInstance = nil; diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m index 09485157b..6e13d8a49 100644 --- a/Riot/AppDelegate.m +++ b/Riot/AppDelegate.m @@ -34,8 +34,7 @@ #import "BugReportViewController.h" #import "RoomKeyRequestViewController.h" -#import "NSBundle+MatrixKit.h" -#import "MatrixSDK/MatrixSDK.h" +#import #import "Tools.h" #import "WidgetManager.h" @@ -49,9 +48,6 @@ // Calls #import "CallViewController.h" -#import -#import - #import "MXSession+Riot.h" #import "MXRoom+Riot.h" diff --git a/Riot/Model/Room/RoomBubbleCellData.h b/Riot/Model/Room/RoomBubbleCellData.h index e9271d8dd..5e4a876b9 100644 --- a/Riot/Model/Room/RoomBubbleCellData.h +++ b/Riot/Model/Room/RoomBubbleCellData.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomBubbleCellDataWithAppendingMode.h" +#import // Custom tags for MXKRoomBubbleCellDataStoring.tag typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag) diff --git a/Riot/Model/Room/RoomPreviewData.h b/Riot/Model/Room/RoomPreviewData.h index 8993caabb..333912c8f 100644 --- a/Riot/Model/Room/RoomPreviewData.h +++ b/Riot/Model/Room/RoomPreviewData.h @@ -16,8 +16,8 @@ #import +#import #import "RoomEmailInvitation.h" -#import "MXSession.h" #import "RoomDataSource.h" /** diff --git a/Riot/Model/RoomList/HomeMessagesSearchDataSource.m b/Riot/Model/RoomList/HomeMessagesSearchDataSource.m index 5076e83ca..b8dd97a71 100644 --- a/Riot/Model/RoomList/HomeMessagesSearchDataSource.m +++ b/Riot/Model/RoomList/HomeMessagesSearchDataSource.m @@ -15,6 +15,8 @@ limitations under the License. */ +#import + #import "HomeMessagesSearchDataSource.h" #import "RoomBubbleCellData.h" diff --git a/Riot/Model/RoomList/RecentCellData.h b/Riot/Model/RoomList/RecentCellData.h index db6d007e4..53bc182bd 100644 --- a/Riot/Model/RoomList/RecentCellData.h +++ b/Riot/Model/RoomList/RecentCellData.h @@ -17,7 +17,8 @@ #import #import -#import "MXKRecentCellData.h" +#import + /** `RecentCellData` is Vector cuustomized MXKRecentCellData` cell. */ diff --git a/Riot/Utils/Widgets/WidgetManager.m b/Riot/Utils/Widgets/WidgetManager.m index 80a7de1a6..94b5e524b 100644 --- a/Riot/Utils/Widgets/WidgetManager.m +++ b/Riot/Utils/Widgets/WidgetManager.m @@ -16,7 +16,7 @@ #import "WidgetManager.h" -#import "MXKAppSettings.h" +#import #pragma mark - Contants diff --git a/Riot/ViewController/MediaPickerViewController.m b/Riot/ViewController/MediaPickerViewController.m index 58599f256..53600cdcc 100644 --- a/Riot/ViewController/MediaPickerViewController.m +++ b/Riot/ViewController/MediaPickerViewController.m @@ -29,7 +29,7 @@ #import "MediaAlbumTableCell.h" -#import "MXKPieChartView.h" +#import static void *CapturingStillImageContext = &CapturingStillImageContext; static void *RecordingContext = &RecordingContext; diff --git a/Riot/ViewController/RecentsViewController.m b/Riot/ViewController/RecentsViewController.m index 82f00299e..87be5a6ad 100644 --- a/Riot/ViewController/RecentsViewController.m +++ b/Riot/ViewController/RecentsViewController.m @@ -23,7 +23,7 @@ #import "MXRoom+Riot.h" -#import "NSBundle+MatrixKit.h" +#import #import "RoomViewController.h" diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m index b130762bf..7e4480732 100644 --- a/Riot/ViewController/SettingsViewController.m +++ b/Riot/ViewController/SettingsViewController.m @@ -17,7 +17,8 @@ #import "SettingsViewController.h" -#import +#import + #import #import #import @@ -26,7 +27,6 @@ #import "AppDelegate.h" #import "AvatarGenerator.h" -#import "MXKEncryptionKeysExportView.h" #import "BugReportViewController.h" #import "WebViewViewController.h" diff --git a/Riot/Views/Contact/ContactTableViewCell.m b/Riot/Views/Contact/ContactTableViewCell.m index 685b3a2b9..42dd51732 100644 --- a/Riot/Views/Contact/ContactTableViewCell.m +++ b/Riot/Views/Contact/ContactTableViewCell.m @@ -17,7 +17,7 @@ #import "ContactTableViewCell.h" -#import "MXKContactManager.h" +#import #import "RiotDesignValues.h" diff --git a/Riot/Views/Directory/DirectoryServerTableViewCell.h b/Riot/Views/Directory/DirectoryServerTableViewCell.h index a2d51e325..e145ef51f 100644 --- a/Riot/Views/Directory/DirectoryServerTableViewCell.h +++ b/Riot/Views/Directory/DirectoryServerTableViewCell.h @@ -16,8 +16,6 @@ #import -#import "MXKDirectoryServerCellDataStoring.h" - /** The `DirectoryServerTableViewCell` cell displays a server . */ diff --git a/Riot/Views/MediaAlbum/MediaAlbumTableCell.h b/Riot/Views/MediaAlbum/MediaAlbumTableCell.h index ac31a750b..40cd11bec 100644 --- a/Riot/Views/MediaAlbum/MediaAlbumTableCell.h +++ b/Riot/Views/MediaAlbum/MediaAlbumTableCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKTableViewCell.h" +#import /** 'MediaAlbumTableCell' is a base class for displaying a user album. diff --git a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentBubbleCell.h b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentBubbleCell.h index 999f76bfa..23157a7e5 100644 --- a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomIncomingAttachmentBubbleCell.h" +#import /** `RoomIncomingAttachmentBubbleCell` displays incoming attachment bubbles with sender's information. diff --git a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h index 50bc9219e..72273f706 100644 --- a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithPaginationTitleBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomIncomingAttachmentBubbleCell.h" +#import /** `RoomIncomingAttachmentWithPaginationTitleBubbleCell` displays incoming attachment bubbles with sender's information and a pagination title. diff --git a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h index e9d3f5e65..2c865f742 100644 --- a/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomIncomingAttachmentWithoutSenderInfoBubbleCell.h" +#import /** `RoomIncomingAttachmentWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information. diff --git a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgBubbleCell.h b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgBubbleCell.h index f5d6557f5..e10ae971d 100644 --- a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomIncomingTextMsgBubbleCell.h" +#import /** `RoomIncomingTextMsgBubbleCell` displays incoming message bubbles with sender's information. diff --git a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h index 8c1555f56..146ad5f53 100644 --- a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithPaginationTitleBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomIncomingTextMsgBubbleCell.h" +#import /** `RoomIncomingTextMsgWithPaginationTitleBubbleCell` displays incoming message bubbles with sender's information. diff --git a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h index 39c0b05e2..bd3d2172f 100644 --- a/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomIncomingTextMsgWithoutSenderInfoBubbleCell.h" +#import /** `RoomIncomingTextMsgWithoutSenderInfoBubbleCell` displays incoming message bubbles without sender's information. diff --git a/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentBubbleCell.h b/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentBubbleCell.h index 0fbcb8834..ab94b9832 100644 --- a/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomOutgoingAttachmentBubbleCell.h" +#import /** `RoomOutgoingAttachmentBubbleCell` displays outgoing attachment bubbles. diff --git a/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h b/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h index 693f69e6a..e7b30e50c 100644 --- a/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h" +#import #import "RoomOutgoingAttachmentBubbleCell.h" /** diff --git a/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgBubbleCell.h b/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgBubbleCell.h index e6bbf74f1..14074912c 100644 --- a/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomOutgoingTextMsgBubbleCell.h" +#import /** `RoomOutgoingTextMsgBubbleCell` displays outgoing message bubbles with user's picture and name. diff --git a/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h b/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h index b063e069d..46879d91f 100644 --- a/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h +++ b/Riot/Views/RoomBubbleList/RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h" +#import /** `RoomOutgoingTextMsgWithoutSenderInfoBubbleCell` displays outgoing message bubbles without user's name. diff --git a/Riot/Views/RoomInputToolbar/KeyboardGrowingTextView.m b/Riot/Views/RoomInputToolbar/KeyboardGrowingTextView.m index 702a4b35f..9fe8d69f1 100644 --- a/Riot/Views/RoomInputToolbar/KeyboardGrowingTextView.m +++ b/Riot/Views/RoomInputToolbar/KeyboardGrowingTextView.m @@ -16,7 +16,7 @@ */ #import -#import +#import #import "RoomInputToolbarView.h" @interface KeyboardGrowingTextView: HPGrowingTextView diff --git a/Riot/Views/Search/MessagesSearchResultAttachmentBubbleCell.h b/Riot/Views/Search/MessagesSearchResultAttachmentBubbleCell.h index 5aa47d1cc..7c01be438 100644 --- a/Riot/Views/Search/MessagesSearchResultAttachmentBubbleCell.h +++ b/Riot/Views/Search/MessagesSearchResultAttachmentBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomBubbleTableViewCell.h" +#import /** `MessagesSearchResultAttachmentBubbleCell` displays an attachment with the information of the room and the sender. diff --git a/Riot/Views/Search/MessagesSearchResultTextMsgBubbleCell.h b/Riot/Views/Search/MessagesSearchResultTextMsgBubbleCell.h index 239b044f8..04228a453 100644 --- a/Riot/Views/Search/MessagesSearchResultTextMsgBubbleCell.h +++ b/Riot/Views/Search/MessagesSearchResultTextMsgBubbleCell.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKRoomBubbleTableViewCell.h" +#import /** `MessagesSearchResultTextMsgBubbleCell` displays a message text with the information of the room and the sender. diff --git a/Riot/Views/TableViewCell/TableViewCellWithButton.h b/Riot/Views/TableViewCell/TableViewCellWithButton.h index 74bae2970..78c703ba1 100644 --- a/Riot/Views/TableViewCell/TableViewCellWithButton.h +++ b/Riot/Views/TableViewCell/TableViewCellWithButton.h @@ -14,8 +14,8 @@ limitations under the License. */ -#import "MXKTableViewCellWithButton.h" +#import @interface TableViewCellWithButton : MXKTableViewCellWithButton -@end \ No newline at end of file +@end diff --git a/Riot/Views/TableViewCell/TableViewCellWithCheckBoxAndLabel.h b/Riot/Views/TableViewCell/TableViewCellWithCheckBoxAndLabel.h index bf6a6f14b..d22b79ff2 100644 --- a/Riot/Views/TableViewCell/TableViewCellWithCheckBoxAndLabel.h +++ b/Riot/Views/TableViewCell/TableViewCellWithCheckBoxAndLabel.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKTableViewCell.h" +#import @interface TableViewCellWithCheckBoxAndLabel : MXKTableViewCell diff --git a/Riot/Views/TableViewCell/TableViewCellWithCheckBoxes.h b/Riot/Views/TableViewCell/TableViewCellWithCheckBoxes.h index 598f622ed..407c9bc6c 100644 --- a/Riot/Views/TableViewCell/TableViewCellWithCheckBoxes.h +++ b/Riot/Views/TableViewCell/TableViewCellWithCheckBoxes.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKTableViewCell.h" +#import @class TableViewCellWithCheckBoxes; @@ -88,4 +88,4 @@ */ - (BOOL)checkBoxValueAtIndex:(NSUInteger)index; -@end \ No newline at end of file +@end diff --git a/Riot/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.h b/Riot/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.h index c810ffbb1..d786b1881 100644 --- a/Riot/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.h +++ b/Riot/Views/TableViewCell/TableViewCellWithLabelAndLargeTextView.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "MXKTableViewCell.h" +#import @interface TableViewCellWithLabelAndLargeTextView : MXKTableViewCell @@ -27,4 +27,4 @@ @property (weak, nonatomic) IBOutlet NSLayoutConstraint *textViewWidthConstraint; @property (weak, nonatomic) IBOutlet NSLayoutConstraint *textViewTrailingConstraint; -@end \ No newline at end of file +@end diff --git a/RiotShareExtension/Model/ShareExtensionManager.m b/RiotShareExtension/Model/ShareExtensionManager.m index 386124d83..9aeadac9f 100644 --- a/RiotShareExtension/Model/ShareExtensionManager.m +++ b/RiotShareExtension/Model/ShareExtensionManager.m @@ -16,7 +16,7 @@ #import "ShareExtensionManager.h" #import "SharePresentingViewController.h" -#import "MXKPieChartHUD.h" +#import @import MobileCoreServices; #import "objc/runtime.h" diff --git a/RiotShareExtension/ViewController/RoomsListViewController.m b/RiotShareExtension/ViewController/RoomsListViewController.m index 687701a54..c3acf02ce 100644 --- a/RiotShareExtension/ViewController/RoomsListViewController.m +++ b/RiotShareExtension/ViewController/RoomsListViewController.m @@ -20,8 +20,7 @@ #import "ShareExtensionManager.h" #import "RecentCellData.h" #import "RiotDesignValues.h" -#import "MXKPieChartView.h" -#import "MXKPieChartHUD.h" +#import @interface RoomsListViewController () diff --git a/SiriIntents/IntentHandler.m b/SiriIntents/IntentHandler.m index 8d3655bdb..57619b7b5 100644 --- a/SiriIntents/IntentHandler.m +++ b/SiriIntents/IntentHandler.m @@ -16,11 +16,7 @@ #import "IntentHandler.h" -#import "MXKAccount.h" -#import "MXKAccountManager.h" -#import "MXFileStore.h" -#import "MXRestClient.h" -#import "MXSession.h" +#import @interface IntentHandler ()