From c967910b7a6a07f09b778a103c10f29f55587583 Mon Sep 17 00:00:00 2001 From: Valentin Buira Date: Tue, 19 Nov 2024 16:26:01 +0100 Subject: [PATCH] Format astyle --- app/featuresmodel.cpp | 4 ++-- app/ios/iosinterface.mm | 18 +++++++++--------- app/ios/iosviewdelegate.h | 4 ++-- core/merginapi.cpp | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/featuresmodel.cpp b/app/featuresmodel.cpp index 7cc386424..c7c444edf 100644 --- a/app/featuresmodel.cpp +++ b/app/featuresmodel.cpp @@ -260,8 +260,8 @@ void FeaturesModel::setupFeatureRequest( QgsFeatureRequest &request ) request.setOrderBy( QgsFeatureRequest::OrderBy( { QgsFeatureRequest::OrderByClause( - mLayer->attributeTableConfig().sortExpression(), - mLayer->attributeTableConfig().sortOrder() == Qt::AscendingOrder ) + mLayer->attributeTableConfig().sortExpression(), + mLayer->attributeTableConfig().sortOrder() == Qt::AscendingOrder ) } ) ); } diff --git a/app/ios/iosinterface.mm b/app/ios/iosinterface.mm index 7a8e3cbf1..8127916d8 100644 --- a/app/ios/iosinterface.mm +++ b/app/ios/iosinterface.mm @@ -184,11 +184,11 @@ +( void )showImagePicker:( int )sourceType : ( IOSImagePicker * )handler NSString *alertOkButtonText = @"Ok"; UIAlertController *alertController = [UIAlertController alertControllerWithTitle:alertTitle - message:alertMessage - preferredStyle:UIAlertControllerStyleAlert]; + message:alertMessage + preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *actionOk = [UIAlertAction actionWithTitle:alertOkButtonText - style:UIAlertActionStyleDefault - handler:nil]; //You can use a block here to handle a press on this button + style:UIAlertActionStyleDefault + handler:nil]; //You can use a block here to handle a press on this button [alertController addAction:actionOk]; [rootViewController presentViewController:alertController animated:YES completion:nil]; } @@ -201,11 +201,11 @@ +( void )showImagePicker:( int )sourceType : ( IOSImagePicker * )handler delegate = [[IOSViewDelegate alloc] initWithHandler:handler]; [[NSNotificationCenter defaultCenter] addObserverForName:@"_UIImagePickerControllerUserDidCaptureItem" object:nil queue:nil usingBlock: ^ ( NSNotification * _Nonnull notification ) - { - Q_UNUSED( notification ) - // Fetch GPS data when an image is captured - mGpsData = getGPSData( delegate->handler->positionKit(), delegate->handler->compass() ); - }]; + { + Q_UNUSED( notification ) + // Fetch GPS data when an image is captured + mGpsData = getGPSData( delegate->handler->positionKit(), delegate->handler->compass() ); + }]; // Confirm event delegate->imagePickerControllerDidFinishPickingMediaWithInfo = ^( UIImagePickerController * picker, NSDictionary * info ) diff --git a/app/ios/iosviewdelegate.h b/app/ios/iosviewdelegate.h index 92e5c4d21..94b180cda 100644 --- a/app/ios/iosviewdelegate.h +++ b/app/ios/iosviewdelegate.h @@ -23,9 +23,9 @@ * View controller for iOSImagePicker */ @interface IOSViewDelegate : NSObject + UINavigationControllerDelegate> { - @public +@public IOSImagePicker *handler; BOOL processingPicture; diff --git a/core/merginapi.cpp b/core/merginapi.cpp index ab5e4a618..875ab7f0b 100644 --- a/core/merginapi.cpp +++ b/core/merginapi.cpp @@ -3184,9 +3184,9 @@ ProjectDiff MerginApi::compareProjectFiles( // check if we should download missing files that were previously ignored (e.g. selective sync has been disabled) bool previouslyIgnoredButShouldDownload = \ - config.downloadMissingFiles && - lastSyncConfig.isValid && - MerginApi::excludeFromSync( file.path, lastSyncConfig ); + config.downloadMissingFiles && + lastSyncConfig.isValid && + MerginApi::excludeFromSync( file.path, lastSyncConfig ); if ( previouslyIgnoredButShouldDownload ) {