diff options
author | Jake Petroules <jake.petroules@qt.io> | 2018-02-01 10:32:07 -0800 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-20 10:02:12 +0000 |
commit | ba871065e0f40e9197fa4ee0ffe76530bb6fca11 (patch) | |
tree | d4361d26260ef3bd96d9f89450893b7c9e99fbeb /src/plugins/platforms/ios/optional | |
parent | 34017a8c5aaca2723fb62e79ea177b5579040ad3 (diff) |
Clean up our Objective-C usage
- Move ivars into @implementation
- Use instancetype where applicable
- Use dot notation for property access
- Use subscript operator for dictionaries and arrays
- Format selectors consistently
- Use proper style for init methods
- Use generics instead of void pointers where possible
- Use "range for" loops instead of indexing
- Replace or replace IBAction/IBOutlet with void
Change-Id: I1667812a51d4dfe44ae80fe337cb1f4bc9699d92
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios/optional')
-rw-r--r-- | src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.h | 6 | ||||
-rw-r--r-- | src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.mm | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.h b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.h index c52d498cd4..201b277494 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.h +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.h @@ -41,8 +41,6 @@ #include "../../qiosfiledialog.h" -@interface QIOSImagePickerController : UIImagePickerController <UIImagePickerControllerDelegate, UINavigationControllerDelegate> { - QIOSFileDialog *m_fileDialog; -} -- (id)initWithQIOSFileDialog:(QIOSFileDialog *)fileDialog; +@interface QIOSImagePickerController : UIImagePickerController <UIImagePickerControllerDelegate, UINavigationControllerDelegate> +- (instancetype)initWithQIOSFileDialog:(QIOSFileDialog *)fileDialog; @end diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.mm index 78e0f00ab4..79d4ecf83f 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosimagepickercontroller.mm @@ -41,15 +41,17 @@ #include "qiosimagepickercontroller.h" -@implementation QIOSImagePickerController +@implementation QIOSImagePickerController { + QIOSFileDialog *m_fileDialog; +} -- (id)initWithQIOSFileDialog:(QIOSFileDialog *)fileDialog +- (instancetype)initWithQIOSFileDialog:(QIOSFileDialog *)fileDialog { self = [super init]; if (self) { m_fileDialog = fileDialog; - [self setSourceType:UIImagePickerControllerSourceTypePhotoLibrary]; - [self setDelegate:self]; + self.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; + self.delegate = self; } return self; } @@ -57,8 +59,8 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { Q_UNUSED(picker); - NSURL *url = [info objectForKey:UIImagePickerControllerReferenceURL]; - QUrl fileUrl = QUrl::fromLocalFile(QString::fromNSString([url description])); + NSURL *url = info[UIImagePickerControllerReferenceURL]; + QUrl fileUrl = QUrl::fromLocalFile(QString::fromNSString(url.description)); m_fileDialog->selectedFilesChanged(QList<QUrl>() << fileUrl); emit m_fileDialog->accept(); } |