From c7c360cd5145723bc556a81fb1d0fd6aad1e0ec2 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 17 Oct 2022 15:04:44 +0200 Subject: [PATCH] QIosTextResponder: stop using deprecated constants and type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use NSWritingDirection and corresponding enumerators instead. Change-Id: Ie76ec2b8d07ab70288c7071182f215412d3e133c Reviewed-by: Tor Arne Vestbø (cherry picked from commit 46b290dda8d41f6c2f71ba24d4b9647507a04b26) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/ios/qiostextresponder.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm index 8069ddb601c..f8bcf7fb256 100644 --- a/src/plugins/platforms/ios/qiostextresponder.mm +++ b/src/plugins/platforms/ios/qiostextresponder.mm @@ -944,20 +944,20 @@ [self sendEventToFocusObject:e]; } -- (void)setBaseWritingDirection:(UITextWritingDirection)writingDirection forRange:(UITextRange *)range +- (void)setBaseWritingDirection:(NSWritingDirection)writingDirection forRange:(UITextRange *)range { Q_UNUSED(writingDirection); Q_UNUSED(range); // Writing direction is handled by QLocale } -- (UITextWritingDirection)baseWritingDirectionForPosition:(UITextPosition *)position inDirection:(UITextStorageDirection)direction +- (NSWritingDirection)baseWritingDirectionForPosition:(UITextPosition *)position inDirection:(UITextStorageDirection)direction { Q_UNUSED(position); Q_UNUSED(direction); if (QLocale::system().textDirection() == Qt::RightToLeft) - return UITextWritingDirectionRightToLeft; - return UITextWritingDirectionLeftToRight; + return NSWritingDirectionRightToLeft; + return NSWritingDirectionLeftToRight; } - (UITextRange *)characterRangeByExtendingPosition:(UITextPosition *)position inDirection:(UITextLayoutDirection)direction