Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style: Set clang-format Standard to Cpp11

Browse source 
For us, it practically only changes the fact that `A<A<int>>` is now
used instead of the C++03 compatible `A<A<int> >`.

Note: clang-format 10+ changed the `Standard` arguments to fully
specified `c++11`, `c++14`, etc. versions, but we can't use `c++17`
now if we want to preserve compatibility with clang-format 8 and 9.
`Cpp11` is still supported as deprecated alias for `Latest`.
This commit is contained in:
Rémi Verschelde 2020-03-17 07:33:00 +01:00
parent c5d76139dc
commit cb282c6ef0
247 changed files with 794 additions and 794 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.clang-format
View file

@ -112,11 +112,11 @@ UseTab: Always
--- ---
### C++ specific config ### ### C++ specific config ###
Language: Cpp Language: Cpp
Standard: Cpp03 Standard: Cpp11
--- ---
### ObjC specific config ### ### ObjC specific config ###
Language: ObjC Language: ObjC
Standard: Cpp03 Standard: Cpp11
ObjCBlockIndentWidth: 4 ObjCBlockIndentWidth: 4
# ObjCSpaceAfterProperty: false # ObjCSpaceAfterProperty: false
# ObjCSpaceBeforeProtocolList: true # ObjCSpaceBeforeProtocolList: true

3
doc/classes/TreeItem.xml
View file

@ -23,8 +23,7 @@
<argument index="4" name="tooltip" type="String" default="&quot;&quot;"> <argument index="4" name="tooltip" type="String" default="&quot;&quot;">
</argument> </argument>
<description> <description>
Adds a button with [Texture2D] [code]button[/code] at column [code]column[/code]. The [code]button_idx[/code] index is used to identify the button when calling other methods. If not specified, the next available index is used, which may be retrieved by calling [method get_button_count] immediately after this method. Optionally, the button can be [code]disabled[/code] and have a [code]tooltip Adds a button with [Texture2D] [code]button[/code] at column [code]column[/code]. The [code]button_idx[/code] index is used to identify the button when calling other methods. If not specified, the next available index is used, which may be retrieved by calling [method get_button_count] immediately after this method. Optionally, the button can be [code]disabled[/code] and have a [code]tooltip[/code].
[/code].
</description> </description>
</method> </method>
<method name="call_recursive" qualifiers="vararg"> <method name="call_recursive" qualifiers="vararg">

8
platform/iphone/app_delegate.h
View file

@ -36,9 +36,11 @@
#import <CoreMotion/CoreMotion.h> #import <CoreMotion/CoreMotion.h>
#if defined(OPENGL_ENABLED) // FIXME: Add support for both GLES2 and Vulkan when GLES2 is implemented again,
@interface AppDelegate : NSObject <UIApplicationDelegate, GLViewDelegate> { // so it can't be done with compilation time branching.
#endif //#if defined(OPENGL_ENABLED)
//@interface AppDelegate : NSObject <UIApplicationDelegate, GLViewDelegate> {
//#endif
#if defined(VULKAN_ENABLED) #if defined(VULKAN_ENABLED)
@interface AppDelegate : NSObject <UIApplicationDelegate> { @interface AppDelegate : NSObject <UIApplicationDelegate> {
#endif #endif

1
platform/iphone/app_delegate.mm
View file

@ -648,7 +648,6 @@ static int frame_count = 0;
view_controller = [[ViewController alloc] init]; view_controller = [[ViewController alloc] init];
view_controller.view = glView; view_controller.view = glView;
_set_keep_screen_on(bool(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true)) ? YES : NO); _set_keep_screen_on(bool(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true)) ? YES : NO);
glView.useCADisplayLink = glView.useCADisplayLink =
bool(GLOBAL_DEF("display.iOS/use_cadisplaylink", true)) ? YES : NO; bool(GLOBAL_DEF("display.iOS/use_cadisplaylink", true)) ? YES : NO;