Skip to content

Commit

Permalink
Revert "astyle format"
Browse files Browse the repository at this point in the history
This reverts commit 8f52a7e.
  • Loading branch information
ValentinBuira committed Nov 19, 2024
1 parent 8f52a7e commit c2037db
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/featuresmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
} ) );
}

Expand Down
18 changes: 9 additions & 9 deletions app/ios/iosinterface.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand All @@ -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 )
Expand Down
6 changes: 3 additions & 3 deletions core/merginapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down

1 comment on commit c2037db

@inputapp-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS - version 24.11.694811 just submitted!

Please sign in to comment.