Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Format astyle #3683

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
4 changes: 2 additions & 2 deletions app/ios/iosviewdelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
* View controller for iOSImagePicker
*/
@interface IOSViewDelegate : NSObject<UIImagePickerControllerDelegate,
UINavigationControllerDelegate>
UINavigationControllerDelegate>
{
@public
@public

IOSImagePicker *handler;
BOOL processingPicture;
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
Loading