From 28bee4b4ba842ef1aa6fb2fe6e0f4967e8f3a594 Mon Sep 17 00:00:00 2001 From: PeterPetrik Date: Mon, 30 Oct 2023 08:10:07 +0100 Subject: [PATCH] astyle --- app/inputprojutils.cpp | 22 +++++++++---------- app/inpututils.cpp | 18 +++++++-------- app/inpututils.h | 18 +++++++-------- .../tracking/androidtrackingbackend.cpp | 6 ++--- .../tracking/androidtrackingbroadcast.cpp | 8 +++---- core/merginapi.cpp | 6 ++--- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/inputprojutils.cpp b/app/inputprojutils.cpp index 32ca5f85c..c2862f654 100644 --- a/app/inputprojutils.cpp +++ b/app/inputprojutils.cpp @@ -69,8 +69,8 @@ static QStringList detailsToStr( const QgsDatumTransform::TransformDetails &deta void InputProjUtils::initCoordinateOperationHandlers() { QgsCoordinateTransform::setCustomMissingRequiredGridHandler( [ = ]( const QgsCoordinateReferenceSystem & sourceCrs, - const QgsCoordinateReferenceSystem & destinationCrs, - const QgsDatumTransform::GridDetails & grid ) + const QgsCoordinateReferenceSystem & destinationCrs, + const QgsDatumTransform::GridDetails & grid ) { Q_UNUSED( destinationCrs ) Q_UNUSED( sourceCrs ) @@ -79,9 +79,9 @@ void InputProjUtils::initCoordinateOperationHandlers() } ); QgsCoordinateTransform::setCustomMissingPreferredGridHandler( [ = ]( const QgsCoordinateReferenceSystem & sourceCrs, - const QgsCoordinateReferenceSystem & destinationCrs, - const QgsDatumTransform::TransformDetails & preferredOperation, - const QgsDatumTransform::TransformDetails & availableOperation ) + const QgsCoordinateReferenceSystem & destinationCrs, + const QgsDatumTransform::TransformDetails & preferredOperation, + const QgsDatumTransform::TransformDetails & availableOperation ) { Q_UNUSED( destinationCrs ) Q_UNUSED( sourceCrs ) @@ -90,8 +90,8 @@ void InputProjUtils::initCoordinateOperationHandlers() } ); QgsCoordinateTransform::setCustomCoordinateOperationCreationErrorHandler( [ = ]( const QgsCoordinateReferenceSystem & sourceCrs, - const QgsCoordinateReferenceSystem & destinationCrs, - const QString & error ) + const QgsCoordinateReferenceSystem & destinationCrs, + const QString & error ) { Q_UNUSED( destinationCrs ) Q_UNUSED( sourceCrs ) @@ -100,8 +100,8 @@ void InputProjUtils::initCoordinateOperationHandlers() } ); QgsCoordinateTransform::setCustomMissingGridUsedByContextHandler( [ = ]( const QgsCoordinateReferenceSystem & sourceCrs, - const QgsCoordinateReferenceSystem & destinationCrs, - const QgsDatumTransform::TransformDetails & desired ) + const QgsCoordinateReferenceSystem & destinationCrs, + const QgsDatumTransform::TransformDetails & desired ) { Q_UNUSED( destinationCrs ) Q_UNUSED( sourceCrs ) @@ -110,8 +110,8 @@ void InputProjUtils::initCoordinateOperationHandlers() } ); QgsCoordinateTransform::setFallbackOperationOccurredHandler( [ = ]( const QgsCoordinateReferenceSystem & sourceCrs, - const QgsCoordinateReferenceSystem & destinationCrs, - const QString & desired ) + const QgsCoordinateReferenceSystem & destinationCrs, + const QString & desired ) { Q_UNUSED( destinationCrs ) Q_UNUSED( sourceCrs ) diff --git a/app/inpututils.cpp b/app/inpututils.cpp index 0a65a8119..185fa8458 100644 --- a/app/inpututils.cpp +++ b/app/inpututils.cpp @@ -755,9 +755,9 @@ QgsPoint InputUtils::coordinateToPoint( const QGeoCoordinate &coor ) } QgsPointXY InputUtils::transformPointXY( const QgsCoordinateReferenceSystem &srcCrs, - const QgsCoordinateReferenceSystem &destCrs, - const QgsCoordinateTransformContext &context, - const QgsPointXY &srcPoint ) + const QgsCoordinateReferenceSystem &destCrs, + const QgsCoordinateTransformContext &context, + const QgsPointXY &srcPoint ) { // we do not want to transform empty points, // QGIS would convert them to a valid (0, 0) points @@ -1302,9 +1302,9 @@ void InputUtils::humanReadableDistance( double srcDistance, Qgis::DistanceUnit s } void InputUtils::formatToMetricDistance( double srcDistance, - Qgis::DistanceUnit srcUnits, - double &destDistance, - Qgis::DistanceUnit &destUnits ) + Qgis::DistanceUnit srcUnits, + double &destDistance, + Qgis::DistanceUnit &destUnits ) { double dist = srcDistance * QgsUnitTypes::fromUnitToUnitFactor( srcUnits, Qgis::DistanceUnit::Millimeters ); if ( dist < 0 ) @@ -1343,9 +1343,9 @@ void InputUtils::formatToMetricDistance( double srcDistance, } void InputUtils::formatToImperialDistance( double srcDistance, - Qgis::DistanceUnit srcUnits, - double &destDistance, - Qgis::DistanceUnit &destUnits ) + Qgis::DistanceUnit srcUnits, + double &destDistance, + Qgis::DistanceUnit &destUnits ) { double dist = srcDistance * QgsUnitTypes::fromUnitToUnitFactor( srcUnits, Qgis::DistanceUnit::Feet ); if ( dist < 0 ) diff --git a/app/inpututils.h b/app/inpututils.h index 27e95b3ed..c45993149 100644 --- a/app/inpututils.h +++ b/app/inpututils.h @@ -235,18 +235,18 @@ class InputUtils: public QObject * Return empty QgsPointXY if the transformation could not be applied or srcPoint is empty */ Q_INVOKABLE static QgsPointXY transformPointXY( const QgsCoordinateReferenceSystem &srcCrs, - const QgsCoordinateReferenceSystem &destCrs, - const QgsCoordinateTransformContext &context, - const QgsPointXY &srcPoint ); + const QgsCoordinateReferenceSystem &destCrs, + const QgsCoordinateTransformContext &context, + const QgsPointXY &srcPoint ); /** * Transforms point between different crs * Return empty QgsPoint if the transformation could not be applied or srcPoint is empty */ Q_INVOKABLE static QgsPoint transformPoint( const QgsCoordinateReferenceSystem &srcCrs, - const QgsCoordinateReferenceSystem &destCrs, - const QgsCoordinateTransformContext &context, - const QgsPoint &srcPoint ); + const QgsCoordinateReferenceSystem &destCrs, + const QgsCoordinateTransformContext &context, + const QgsPoint &srcPoint ); /** * Transforms point between CRS and screen pixels @@ -371,9 +371,9 @@ class InputUtils: public QObject * \returns string represetation of dist in desired destSystem. For distance less than 0, 0 is returned. */ Q_INVOKABLE static QString formatDistance( double distance, - Qgis::DistanceUnit units, - int decimals, - Qgis::SystemOfMeasurement destSystem = Qgis::SystemOfMeasurement::Metric ); + Qgis::DistanceUnit units, + int decimals, + Qgis::SystemOfMeasurement destSystem = Qgis::SystemOfMeasurement::Metric ); /** * Deletes file from a given path. diff --git a/app/position/tracking/androidtrackingbackend.cpp b/app/position/tracking/androidtrackingbackend.cpp index 41b025147..4d35a9915 100644 --- a/app/position/tracking/androidtrackingbackend.cpp +++ b/app/position/tracking/androidtrackingbackend.cpp @@ -57,9 +57,9 @@ AndroidTrackingBackend::~AndroidTrackingBackend() QAndroidIntent serviceIntent( activity.object(), "uk/co/lutraconsulting/PositionTrackingService" ); activity.callMethod( - "stopService", - "(Landroid/content/Intent;)Z", - serviceIntent.handle().object() ); + "stopService", + "(Landroid/content/Intent;)Z", + serviceIntent.handle().object() ); if ( mTrackingFile.isOpen() ) { diff --git a/app/position/tracking/androidtrackingbroadcast.cpp b/app/position/tracking/androidtrackingbroadcast.cpp index e67e0e702..917177a3c 100644 --- a/app/position/tracking/androidtrackingbroadcast.cpp +++ b/app/position/tracking/androidtrackingbroadcast.cpp @@ -53,10 +53,10 @@ bool AndroidTrackingBroadcast::registerBroadcastPrivate() javaenv->DeleteLocalRef( objectClass ); mBroadcastReceiver.callMethod( - "registerBroadcastReceiver", - "(Landroid/content/Context;)V", - QNativeInterface::QAndroidApplication::context() - ); + "registerBroadcastReceiver", + "(Landroid/content/Context;)V", + QNativeInterface::QAndroidApplication::context() + ); mBroadcastIsRegistered = true; diff --git a/core/merginapi.cpp b/core/merginapi.cpp index 799aa1fc9..e44588f72 100644 --- a/core/merginapi.cpp +++ b/core/merginapi.cpp @@ -3015,9 +3015,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 ) {