Astyle

Author: nyalldawson

src/app/qgisapp.cpp

@@ -346,7 +346,7 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #endif
 #ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#endif	
+#endif
 #include <proj_api.h>
 
 //

src/app/qgscustomprojectiondialog.cpp

@@ -42,7 +42,7 @@ extern "C"
 {
 #ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#endif		
+#endif
 #include <proj_api.h>
 }
 

src/core/qgscoordinatetransform_p.cpp

@@ -23,7 +23,7 @@ extern "C"
 {
 #ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#endif	
+#endif
 #include <proj_api.h>
 }
 #include <sqlite3.h>

src/native/mac/qgsmacnative.mm

@@ -122,12 +122,15 @@ - ( BOOL )userNotificationCenter:( NSUserNotificationCenter * )center shouldPres
 bool QgsMacNative::hasDarkTheme()
 {
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_14
-  if ([NSApp respondsToSelector:@selector(effectiveAppearance)]) {
+  if ( [NSApp respondsToSelector:@selector( effectiveAppearance )] )
+  {
     // compiled on macos 10.14+ AND running on macos 10.14+
     // check the settings of effective appearance of the user
     NSAppearanceName appearanceName = [NSApp.effectiveAppearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
-    return ([appearanceName isEqualToString:NSAppearanceNameDarkAqua]);
-  } else {
+    return ( [appearanceName isEqualToString:NSAppearanceNameDarkAqua] );
+  }
+  else
+  {
     // compiled on macos 10.14+ BUT running on macos 10.13-
     // DarkTheme was introduced in MacOS 10.14, fallback to light theme
     return false;

tests/src/core/testqgscoordinatereferencesystem.cpp

@@ -26,7 +26,7 @@ Email                : sherman at mrcc dot com
 
 #ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#endif	
+#endif
 #include <proj_api.h>
 #include <gdal.h>
 #include <cpl_conv.h>