Merge pull request #101174 from Repiteo/style/objc-import-syntax

Style: Standardize Obj-C `#import` syntax
2025-03-10 10:01:02 -05:00
parent cae3d722a3 713a1ba554
commit a5acf1dc81
39 changed files with 93 additions and 91 deletions
--- a/platform/macos/crash_handler_macos.mm
+++ b/platform/macos/crash_handler_macos.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "crash_handler_macos.h"
+#import "crash_handler_macos.h"

 #include "core/config/project_settings.h"
 #include "core/os/os.h"
@ -50,8 +50,8 @@
 #include <signal.h>
 #include <stdlib.h>

-#include <mach-o/dyld.h>
-#include <mach-o/getsect.h>
+#import <mach-o/dyld.h>
+#import <mach-o/getsect.h>

 static uint64_t load_address() {
 	const struct segment_command_64 *cmd = getsegbyname("__TEXT");
--- a/platform/macos/dir_access_macos.mm
+++ b/platform/macos/dir_access_macos.mm
@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "dir_access_macos.h"
-
-#include "core/config/project_settings.h"
+#import "dir_access_macos.h"

 #if defined(UNIX_ENABLED)

+#include "core/config/project_settings.h"
+
 #include <errno.h>

 #import <AppKit/NSWorkspace.h>
--- a/platform/macos/display_server_macos.h
+++ b/platform/macos/display_server_macos.h
@ -38,16 +38,16 @@
 #include "gl_manager_macos_legacy.h"
 #endif // GLES3_ENABLED

-#include "native_menu_macos.h"
+#import "native_menu_macos.h"

 #if defined(RD_ENABLED)
 #include "servers/rendering/rendering_device.h"

 #if defined(VULKAN_ENABLED)
-#include "rendering_context_driver_vulkan_macos.h"
+#import "rendering_context_driver_vulkan_macos.h"
 #endif // VULKAN_ENABLED
 #if defined(METAL_ENABLED)
-#include "drivers/metal/rendering_context_driver_metal.h"
+#import "drivers/metal/rendering_context_driver_metal.h"
 #endif
 #endif // RD_ENABLED

--- a/platform/macos/display_server_macos.mm
+++ b/platform/macos/display_server_macos.mm
@ -28,19 +28,19 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "display_server_macos.h"
+#import "display_server_macos.h"

-#include "godot_button_view.h"
-#include "godot_content_view.h"
-#include "godot_menu_delegate.h"
-#include "godot_menu_item.h"
-#include "godot_open_save_delegate.h"
-#include "godot_status_item.h"
-#include "godot_window.h"
-#include "godot_window_delegate.h"
-#include "key_mapping_macos.h"
-#include "os_macos.h"
-#include "tts_macos.h"
+#import "godot_button_view.h"
+#import "godot_content_view.h"
+#import "godot_menu_delegate.h"
+#import "godot_menu_item.h"
+#import "godot_open_save_delegate.h"
+#import "godot_status_item.h"
+#import "godot_window.h"
+#import "godot_window_delegate.h"
+#import "key_mapping_macos.h"
+#import "os_macos.h"
+#import "tts_macos.h"

 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
--- a/platform/macos/gl_manager_macos_angle.h
+++ b/platform/macos/gl_manager_macos_angle.h
@ -38,9 +38,9 @@
 #include "drivers/egl/egl_manager.h"
 #include "servers/display_server.h"

-#include <AppKit/AppKit.h>
-#include <ApplicationServices/ApplicationServices.h>
-#include <CoreVideo/CoreVideo.h>
+#import <AppKit/AppKit.h>
+#import <ApplicationServices/ApplicationServices.h>
+#import <CoreVideo/CoreVideo.h>

 class GLManagerANGLE_MacOS : public EGLManager {
 private:
--- a/platform/macos/gl_manager_macos_angle.mm
+++ b/platform/macos/gl_manager_macos_angle.mm
@ -28,14 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gl_manager_macos_angle.h"
+#import "gl_manager_macos_angle.h"

 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)

 #include <stdio.h>
 #include <stdlib.h>

-#include <EGL/eglext_angle.h>
+#import <EGL/eglext_angle.h>

 const char *GLManagerANGLE_MacOS::_get_platform_extension_name() const {
 	return "EGL_ANGLE_platform_angle";
--- a/platform/macos/gl_manager_macos_legacy.mm
+++ b/platform/macos/gl_manager_macos_legacy.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gl_manager_macos_legacy.h"
+#import "gl_manager_macos_legacy.h"

 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)

--- a/platform/macos/godot_application.mm
+++ b/platform/macos/godot_application.mm
@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_application.h"
+#import "godot_application.h"

-#include "display_server_macos.h"
+#import "display_server_macos.h"

@implementation GodotApplication

--- a/platform/macos/godot_application_delegate.mm
+++ b/platform/macos/godot_application_delegate.mm
@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_application_delegate.h"
+#import "godot_application_delegate.h"

-#include "display_server_macos.h"
-#include "native_menu_macos.h"
-#include "os_macos.h"
+#import "display_server_macos.h"
+#import "native_menu_macos.h"
+#import "os_macos.h"

@implementation GodotApplicationDelegate

--- a/platform/macos/godot_button_view.mm
+++ b/platform/macos/godot_button_view.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_button_view.h"
+#import "godot_button_view.h"

@implementation GodotButtonView

--- a/platform/macos/godot_content_view.mm
+++ b/platform/macos/godot_content_view.mm
@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_content_view.h"
+#import "godot_content_view.h"

-#include "display_server_macos.h"
-#include "key_mapping_macos.h"
+#import "display_server_macos.h"
+#import "key_mapping_macos.h"

 #include "main/main.h"

--- a/platform/macos/godot_main_macos.mm
+++ b/platform/macos/godot_main_macos.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "os_macos.h"
+#import "os_macos.h"

 #include "main/main.h"

--- a/platform/macos/godot_menu_delegate.mm
+++ b/platform/macos/godot_menu_delegate.mm
@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_menu_delegate.h"
+#import "godot_menu_delegate.h"

-#include "display_server_macos.h"
-#include "godot_menu_item.h"
-#include "key_mapping_macos.h"
-#include "native_menu_macos.h"
+#import "display_server_macos.h"
+#import "godot_menu_item.h"
+#import "key_mapping_macos.h"
+#import "native_menu_macos.h"

@implementation GodotMenuDelegate

--- a/platform/macos/godot_menu_item.mm
+++ b/platform/macos/godot_menu_item.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_menu_item.h"
+#import "godot_menu_item.h"

@implementation GodotMenuItem

--- a/platform/macos/godot_open_save_delegate.mm
+++ b/platform/macos/godot_open_save_delegate.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_open_save_delegate.h"
+#import "godot_open_save_delegate.h"

@implementation GodotOpenSaveDelegate

--- a/platform/macos/godot_status_item.mm
+++ b/platform/macos/godot_status_item.mm
@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_status_item.h"
+#import "godot_status_item.h"

-#include "display_server_macos.h"
+#import "display_server_macos.h"

@implementation GodotStatusItemDelegate

--- a/platform/macos/godot_window.mm
+++ b/platform/macos/godot_window.mm
@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_window.h"
+#import "godot_window.h"

-#include "display_server_macos.h"
+#import "display_server_macos.h"

@implementation GodotWindow

--- a/platform/macos/godot_window_delegate.mm
+++ b/platform/macos/godot_window_delegate.mm
@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "godot_window_delegate.h"
+#import "godot_window_delegate.h"

-#include "display_server_macos.h"
-#include "godot_button_view.h"
-#include "godot_window.h"
+#import "display_server_macos.h"
+#import "godot_button_view.h"
+#import "godot_window.h"

@implementation GodotWindowDelegate

--- a/platform/macos/key_mapping_macos.mm
+++ b/platform/macos/key_mapping_macos.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "key_mapping_macos.h"
+#import "key_mapping_macos.h"

 #include "core/templates/hash_map.h"
 #include "core/templates/hash_set.h"
--- a/platform/macos/macos_terminal_logger.mm
+++ b/platform/macos/macos_terminal_logger.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "macos_terminal_logger.h"
+#import "macos_terminal_logger.h"

 #ifdef MACOS_ENABLED

--- a/platform/macos/native_menu_macos.mm
+++ b/platform/macos/native_menu_macos.mm
@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "native_menu_macos.h"
+#import "native_menu_macos.h"

-#include "display_server_macos.h"
-#include "godot_menu_item.h"
-#include "key_mapping_macos.h"
+#import "display_server_macos.h"
+#import "godot_menu_item.h"
+#import "key_mapping_macos.h"

 #include "scene/resources/image_texture.h"

--- a/platform/macos/os_macos.mm
+++ b/platform/macos/os_macos.mm
@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "os_macos.h"
+#import "os_macos.h"

-#include "dir_access_macos.h"
-#include "display_server_macos.h"
-#include "godot_application.h"
-#include "godot_application_delegate.h"
-#include "macos_terminal_logger.h"
+#import "dir_access_macos.h"
+#import "display_server_macos.h"
+#import "godot_application.h"
+#import "godot_application_delegate.h"
+#import "macos_terminal_logger.h"

 #include "core/crypto/crypto_core.h"
 #include "core/version_generated.gen.h"
@ -42,7 +42,7 @@

 #include <dlfcn.h>
 #include <libproc.h>
-#include <mach-o/dyld.h>
+#import <mach-o/dyld.h>
 #include <os/log.h>
 #include <sys/sysctl.h>

--- a/platform/macos/rendering_context_driver_vulkan_macos.mm
+++ b/platform/macos/rendering_context_driver_vulkan_macos.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "rendering_context_driver_vulkan_macos.h"
+#import "rendering_context_driver_vulkan_macos.h"

 #ifdef VULKAN_ENABLED

--- a/platform/macos/tts_macos.mm
+++ b/platform/macos/tts_macos.mm
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "tts_macos.h"
+#import "tts_macos.h"

@implementation TTS_MacOS