From 93aa2f1f8f164b30a75920de3644010f0a101039 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 21 Nov 2024 09:28:45 +1300 Subject: [PATCH 1/4] Allow GTK style enum naming --- shell/platform/linux/.clang-tidy | 2 ++ shell/platform/linux/fl_engine_private.h | 2 -- shell/platform/linux/fl_renderer.h | 2 -- shell/platform/linux/fl_settings.h | 4 ---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/shell/platform/linux/.clang-tidy b/shell/platform/linux/.clang-tidy index 42d8632c23f39..bc9095612f326 100644 --- a/shell/platform/linux/.clang-tidy +++ b/shell/platform/linux/.clang-tidy @@ -1,5 +1,7 @@ InheritParentConfig: true # EnumCastOutOfRange warns about some common usages of GTK macros +# EnumCase allows GTK style enum values Checks: >- -clang-analyzer-optin.core.EnumCastOutOfRange + -readability-identifier-naming.EnumCase diff --git a/shell/platform/linux/fl_engine_private.h b/shell/platform/linux/fl_engine_private.h index 761b9bbd30b13..b6fce3056d9e7 100644 --- a/shell/platform/linux/fl_engine_private.h +++ b/shell/platform/linux/fl_engine_private.h @@ -22,9 +22,7 @@ G_BEGIN_DECLS */ typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_ENGINE_ERROR_FAILED, - // NOLINTEND(readability-identifier-naming) } FlEngineError; GQuark fl_engine_error_quark(void) G_GNUC_CONST; diff --git a/shell/platform/linux/fl_renderer.h b/shell/platform/linux/fl_renderer.h index b107442ea4d43..b59f5e4297f1a 100644 --- a/shell/platform/linux/fl_renderer.h +++ b/shell/platform/linux/fl_renderer.h @@ -20,9 +20,7 @@ G_BEGIN_DECLS */ typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_RENDERER_ERROR_FAILED, - // NOLINTEND(readability-identifier-naming) } FlRendererError; GQuark fl_renderer_error_quark(void) G_GNUC_CONST; diff --git a/shell/platform/linux/fl_settings.h b/shell/platform/linux/fl_settings.h index f7305f1876d51..4453fd86196ce 100644 --- a/shell/platform/linux/fl_settings.h +++ b/shell/platform/linux/fl_settings.h @@ -19,10 +19,8 @@ G_DECLARE_INTERFACE(FlSettings, fl_settings, FL, SETTINGS, GObject) * Available clock formats. */ typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_CLOCK_FORMAT_12H, FL_CLOCK_FORMAT_24H, - // NOLINTEND(readability-identifier-naming) } FlClockFormat; /** @@ -33,10 +31,8 @@ typedef enum { * Available color schemes. */ typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_COLOR_SCHEME_LIGHT, FL_COLOR_SCHEME_DARK, - // NOLINTEND(readability-identifier-naming) } FlColorScheme; /** From 56e82661e86fbaa5407e58c8b15bb6504f5a2112 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 21 Nov 2024 10:23:05 +1300 Subject: [PATCH 2/4] WIP --- shell/platform/linux/.clang-tidy | 8 +++++++- shell/platform/linux/fl_accessible_node.cc | 10 +++++----- shell/platform/linux/fl_application.cc | 12 ++++++------ shell/platform/linux/fl_engine.cc | 14 +++++++------- shell/platform/linux/fl_engine_private.h | 2 -- shell/platform/linux/fl_gnome_settings.cc | 6 +++--- shell/platform/linux/fl_mouse_cursor_handler.cc | 9 +++++---- shell/platform/linux/fl_platform_channel.h | 4 ---- shell/platform/linux/fl_renderer.h | 2 -- shell/platform/linux/fl_settings.cc | 10 +++++----- shell/platform/linux/fl_settings.h | 4 ---- shell/platform/linux/fl_settings_channel.h | 2 -- shell/platform/linux/fl_standard_method_codec.cc | 8 ++++---- shell/platform/linux/fl_text_input_channel.h | 4 ---- shell/platform/linux/fl_view.cc | 8 ++++---- shell/platform/linux/fl_view_accessible.cc | 2 -- .../public/flutter_linux/fl_binary_messenger.h | 1 - .../public/flutter_linux/fl_json_message_codec.h | 2 -- .../linux/public/flutter_linux/fl_message_codec.h | 2 -- .../public/flutter_linux/fl_method_response.h | 2 -- .../platform/linux/public/flutter_linux/fl_value.h | 2 -- 21 files changed, 46 insertions(+), 68 deletions(-) diff --git a/shell/platform/linux/.clang-tidy b/shell/platform/linux/.clang-tidy index 42d8632c23f39..55390eaeff6b3 100644 --- a/shell/platform/linux/.clang-tidy +++ b/shell/platform/linux/.clang-tidy @@ -2,4 +2,10 @@ InheritParentConfig: true # EnumCastOutOfRange warns about some common usages of GTK macros Checks: >- - -clang-analyzer-optin.core.EnumCastOutOfRange + - clang-analyzer-optin.core.EnumCastOutOfRange + +CheckOptions: + - key: readability-identifier-naming.EnumConstantCase + value: "UPPER_CASE" + - key: readability-identifier-naming.EnumConstantPrefix + value: "" diff --git a/shell/platform/linux/fl_accessible_node.cc b/shell/platform/linux/fl_accessible_node.cc index 962ff0cc354fa..37d54833fd906 100644 --- a/shell/platform/linux/fl_accessible_node.cc +++ b/shell/platform/linux/fl_accessible_node.cc @@ -81,7 +81,7 @@ struct FlAccessibleNodePrivate { FlutterSemanticsFlag flags; }; -enum { kProp0, kPropEngine, kPropId, kPropLast }; +enum { PROP_0, PROP_ENGINE, PROP_ID, PROP_LAST }; #define FL_ACCESSIBLE_NODE_GET_PRIVATE(node) \ ((FlAccessibleNodePrivate*)fl_accessible_node_get_instance_private( \ @@ -145,13 +145,13 @@ static void fl_accessible_node_set_property(GObject* object, GParamSpec* pspec) { FlAccessibleNodePrivate* priv = FL_ACCESSIBLE_NODE_GET_PRIVATE(object); switch (prop_id) { - case kPropEngine: + case PROP_ENGINE: g_assert(priv->engine == nullptr); priv->engine = FL_ENGINE(g_value_get_object(value)); g_object_add_weak_pointer(object, reinterpret_cast(&priv->engine)); break; - case kPropId: + case PROP_ID: priv->id = g_value_get_int(value); break; default: @@ -448,13 +448,13 @@ static void fl_accessible_node_class_init(FlAccessibleNodeClass* klass) { fl_accessible_node_perform_action_impl; g_object_class_install_property( - G_OBJECT_CLASS(klass), kPropEngine, + G_OBJECT_CLASS(klass), PROP_ENGINE, g_param_spec_object( "engine", "engine", "Flutter engine", fl_engine_get_type(), static_cast(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS))); g_object_class_install_property( - G_OBJECT_CLASS(klass), kPropId, + G_OBJECT_CLASS(klass), PROP_ID, g_param_spec_int( "id", "id", "Accessibility node ID", 0, G_MAXINT, 0, static_cast(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | diff --git a/shell/platform/linux/fl_application.cc b/shell/platform/linux/fl_application.cc index 203d8a12df5e0..721d53eac3700 100644 --- a/shell/platform/linux/fl_application.cc +++ b/shell/platform/linux/fl_application.cc @@ -22,9 +22,9 @@ struct FlApplicationPrivate { ((FlApplicationPrivate*)fl_application_get_instance_private( \ FL_APPLICATION(app))) -enum { kSignalRegisterPlugins, kSignalCreateWindow, kSignalLastSignal }; +enum { SIGNAL_REGISTER_PLUGINS, SIGNAL_CREATE_WINDOW, LAST_SIGNAL }; -static guint fl_application_signals[kSignalLastSignal]; +static guint fl_application_signals[LAST_SIGNAL]; G_DEFINE_TYPE_WITH_CODE(FlApplication, fl_application, @@ -95,14 +95,14 @@ static void fl_application_activate(GApplication* application) { gtk_widget_show(GTK_WIDGET(view)); GtkWindow* window; - g_signal_emit(self, fl_application_signals[kSignalCreateWindow], 0, view, + g_signal_emit(self, fl_application_signals[SIGNAL_CREATE_WINDOW], 0, view, &window); // Make the resources for the view so rendering can start. // We'll show the view when we have the first frame. gtk_widget_realize(GTK_WIDGET(view)); - g_signal_emit(self, fl_application_signals[kSignalRegisterPlugins], 0, + g_signal_emit(self, fl_application_signals[SIGNAL_REGISTER_PLUGINS], 0, FL_PLUGIN_REGISTRY(view)); } @@ -150,11 +150,11 @@ static void fl_application_class_init(FlApplicationClass* klass) { klass->register_plugins = fl_application_register_plugins; klass->create_window = fl_application_create_window; - fl_application_signals[kSignalRegisterPlugins] = g_signal_new( + fl_application_signals[SIGNAL_REGISTER_PLUGINS] = g_signal_new( "register-plugins", fl_application_get_type(), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(FlApplicationClass, register_plugins), nullptr, nullptr, nullptr, G_TYPE_NONE, 1, fl_plugin_registry_get_type()); - fl_application_signals[kSignalCreateWindow] = g_signal_new( + fl_application_signals[SIGNAL_CREATE_WINDOW] = g_signal_new( "create-window", fl_application_get_type(), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(FlApplicationClass, create_window), g_signal_accumulator_first_wins, nullptr, nullptr, GTK_TYPE_WINDOW, 1, diff --git a/shell/platform/linux/fl_engine.cc b/shell/platform/linux/fl_engine.cc index 4cf987fba6623..0cc9497102e37 100644 --- a/shell/platform/linux/fl_engine.cc +++ b/shell/platform/linux/fl_engine.cc @@ -92,9 +92,9 @@ G_DEFINE_QUARK(fl_engine_error_quark, fl_engine_error) static void fl_engine_plugin_registry_iface_init( FlPluginRegistryInterface* iface); -enum { kSignalOnPreEngineRestart, kSignalLastSignal }; +enum { SIGNAL_ON_PRE_ENGINE_RESTART, LAST_SIGNAL }; -static guint fl_engine_signals[kSignalLastSignal]; +static guint fl_engine_signals[LAST_SIGNAL]; G_DEFINE_TYPE_WITH_CODE( FlEngine, @@ -103,7 +103,7 @@ G_DEFINE_TYPE_WITH_CODE( G_IMPLEMENT_INTERFACE(fl_plugin_registry_get_type(), fl_engine_plugin_registry_iface_init)) -enum { kProp0, kPropBinaryMessenger, kPropLast }; +enum { PROP_0, PROP_BINARY_MESSENGER, PROP_LAST }; // Parse a locale into its components. static void parse_locale(const gchar* locale, @@ -386,7 +386,7 @@ static void fl_engine_update_semantics_cb(const FlutterSemanticsUpdate2* update, static void fl_engine_on_pre_engine_restart_cb(void* user_data) { FlEngine* self = FL_ENGINE(user_data); - g_signal_emit(self, fl_engine_signals[kSignalOnPreEngineRestart], 0); + g_signal_emit(self, fl_engine_signals[SIGNAL_ON_PRE_ENGINE_RESTART], 0); } // Called when a response to a sent platform message is received from the @@ -420,7 +420,7 @@ static void fl_engine_set_property(GObject* object, GParamSpec* pspec) { FlEngine* self = FL_ENGINE(object); switch (prop_id) { - case kPropBinaryMessenger: + case PROP_BINARY_MESSENGER: g_set_object(&self->binary_messenger, FL_BINARY_MESSENGER(g_value_get_object(value))); break; @@ -477,14 +477,14 @@ static void fl_engine_class_init(FlEngineClass* klass) { G_OBJECT_CLASS(klass)->set_property = fl_engine_set_property; g_object_class_install_property( - G_OBJECT_CLASS(klass), kPropBinaryMessenger, + G_OBJECT_CLASS(klass), PROP_BINARY_MESSENGER, g_param_spec_object( "binary-messenger", "messenger", "Binary messenger", fl_binary_messenger_get_type(), static_cast(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS))); - fl_engine_signals[kSignalOnPreEngineRestart] = g_signal_new( + fl_engine_signals[SIGNAL_ON_PRE_ENGINE_RESTART] = g_signal_new( "on-pre-engine-restart", fl_engine_get_type(), G_SIGNAL_RUN_LAST, 0, nullptr, nullptr, nullptr, G_TYPE_NONE, 0); } diff --git a/shell/platform/linux/fl_engine_private.h b/shell/platform/linux/fl_engine_private.h index 761b9bbd30b13..b6fce3056d9e7 100644 --- a/shell/platform/linux/fl_engine_private.h +++ b/shell/platform/linux/fl_engine_private.h @@ -22,9 +22,7 @@ G_BEGIN_DECLS */ typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_ENGINE_ERROR_FAILED, - // NOLINTEND(readability-identifier-naming) } FlEngineError; GQuark fl_engine_error_quark(void) G_GNUC_CONST; diff --git a/shell/platform/linux/fl_gnome_settings.cc b/shell/platform/linux/fl_gnome_settings.cc index e20b1bb053091..da958a3898b8b 100644 --- a/shell/platform/linux/fl_gnome_settings.cc +++ b/shell/platform/linux/fl_gnome_settings.cc @@ -22,7 +22,7 @@ struct _FlGnomeSettings { GSettings* interface_settings; }; -enum { kProp0, kPropInterfaceSettings, kPropLast }; +enum { PROP_0, PROP_INTERFACE_SETTINGS, PROP_LAST }; static void fl_gnome_settings_iface_init(FlSettingsInterface* iface); @@ -106,7 +106,7 @@ static void fl_gnome_settings_set_property(GObject* object, GParamSpec* pspec) { FlGnomeSettings* self = FL_GNOME_SETTINGS(object); switch (prop_id) { - case kPropInterfaceSettings: + case PROP_INTERFACE_SETTINGS: fl_gnome_settings_set_interface_settings( self, G_SETTINGS(g_value_get_object(value))); break; @@ -130,7 +130,7 @@ static void fl_gnome_settings_class_init(FlGnomeSettingsClass* klass) { object_class->set_property = fl_gnome_settings_set_property; g_object_class_install_property( - object_class, kPropInterfaceSettings, + object_class, PROP_INTERFACE_SETTINGS, g_param_spec_object( kInterfaceSettings, kInterfaceSettings, kDesktopInterfaceSchema, g_settings_get_type(), diff --git a/shell/platform/linux/fl_mouse_cursor_handler.cc b/shell/platform/linux/fl_mouse_cursor_handler.cc index 449a063f2d532..d70fb17acd7ad 100644 --- a/shell/platform/linux/fl_mouse_cursor_handler.cc +++ b/shell/platform/linux/fl_mouse_cursor_handler.cc @@ -21,9 +21,9 @@ struct _FlMouseCursorHandler { gchar* cursor_name; }; -enum { kSignalCursorChanged, kSignalLastSignal }; +enum { SIGNAL_CURSOR_CHANGED, LAST_SIGNAL }; -static guint fl_mouse_cursor_handler_signals[kSignalLastSignal]; +static guint fl_mouse_cursor_handler_signals[LAST_SIGNAL]; G_DEFINE_TYPE(FlMouseCursorHandler, fl_mouse_cursor_handler, G_TYPE_OBJECT) @@ -100,7 +100,8 @@ static void activate_system_cursor(const gchar* kind, gpointer user_data) { g_free(self->cursor_name); self->cursor_name = g_strdup(cursor_name); - g_signal_emit(self, fl_mouse_cursor_handler_signals[kSignalCursorChanged], 0); + g_signal_emit(self, fl_mouse_cursor_handler_signals[SIGNAL_CURSOR_CHANGED], + 0); } static void fl_mouse_cursor_handler_dispose(GObject* object) { @@ -117,7 +118,7 @@ static void fl_mouse_cursor_handler_class_init( FlMouseCursorHandlerClass* klass) { G_OBJECT_CLASS(klass)->dispose = fl_mouse_cursor_handler_dispose; - fl_mouse_cursor_handler_signals[kSignalCursorChanged] = + fl_mouse_cursor_handler_signals[SIGNAL_CURSOR_CHANGED] = g_signal_new("cursor-changed", fl_mouse_cursor_handler_get_type(), G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/shell/platform/linux/fl_platform_channel.h b/shell/platform/linux/fl_platform_channel.h index b1cdf9328a653..3dd5e424b44f7 100644 --- a/shell/platform/linux/fl_platform_channel.h +++ b/shell/platform/linux/fl_platform_channel.h @@ -11,17 +11,13 @@ G_BEGIN_DECLS typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_PLATFORM_CHANNEL_EXIT_TYPE_CANCELABLE, FL_PLATFORM_CHANNEL_EXIT_TYPE_REQUIRED, - // NOLINTEND(readability-identifier-naming) } FlPlatformChannelExitType; typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_PLATFORM_CHANNEL_EXIT_RESPONSE_CANCEL, FL_PLATFORM_CHANNEL_EXIT_RESPONSE_EXIT, - // NOLINTEND(readability-identifier-naming) } FlPlatformChannelExitResponse; G_DECLARE_FINAL_TYPE(FlPlatformChannel, diff --git a/shell/platform/linux/fl_renderer.h b/shell/platform/linux/fl_renderer.h index b107442ea4d43..b59f5e4297f1a 100644 --- a/shell/platform/linux/fl_renderer.h +++ b/shell/platform/linux/fl_renderer.h @@ -20,9 +20,7 @@ G_BEGIN_DECLS */ typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_RENDERER_ERROR_FAILED, - // NOLINTEND(readability-identifier-naming) } FlRendererError; GQuark fl_renderer_error_quark(void) G_GNUC_CONST; diff --git a/shell/platform/linux/fl_settings.cc b/shell/platform/linux/fl_settings.cc index 39821b779ecb0..84b06ee9267b2 100644 --- a/shell/platform/linux/fl_settings.cc +++ b/shell/platform/linux/fl_settings.cc @@ -9,11 +9,11 @@ G_DEFINE_INTERFACE(FlSettings, fl_settings, G_TYPE_OBJECT) enum { - kSignalChanged, - kSignalLastSignal, + SIGNAL_CHANGED, + LAST_SIGNAL, }; -static guint signals[kSignalLastSignal]; +static guint signals[LAST_SIGNAL]; static void fl_settings_default_init(FlSettingsInterface* iface) { /** @@ -22,7 +22,7 @@ static void fl_settings_default_init(FlSettingsInterface* iface) { * * This signal is emitted after the settings have been changed. */ - signals[kSignalChanged] = + signals[SIGNAL_CHANGED] = g_signal_new("changed", G_TYPE_FROM_INTERFACE(iface), G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); } @@ -49,7 +49,7 @@ gdouble fl_settings_get_text_scaling_factor(FlSettings* self) { void fl_settings_emit_changed(FlSettings* self) { g_return_if_fail(FL_IS_SETTINGS(self)); - g_signal_emit(self, signals[kSignalChanged], 0); + g_signal_emit(self, signals[SIGNAL_CHANGED], 0); } FlSettings* fl_settings_new() { diff --git a/shell/platform/linux/fl_settings.h b/shell/platform/linux/fl_settings.h index f7305f1876d51..4453fd86196ce 100644 --- a/shell/platform/linux/fl_settings.h +++ b/shell/platform/linux/fl_settings.h @@ -19,10 +19,8 @@ G_DECLARE_INTERFACE(FlSettings, fl_settings, FL, SETTINGS, GObject) * Available clock formats. */ typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_CLOCK_FORMAT_12H, FL_CLOCK_FORMAT_24H, - // NOLINTEND(readability-identifier-naming) } FlClockFormat; /** @@ -33,10 +31,8 @@ typedef enum { * Available color schemes. */ typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_COLOR_SCHEME_LIGHT, FL_COLOR_SCHEME_DARK, - // NOLINTEND(readability-identifier-naming) } FlColorScheme; /** diff --git a/shell/platform/linux/fl_settings_channel.h b/shell/platform/linux/fl_settings_channel.h index 6f1945942e76a..3c3409a2f90e2 100644 --- a/shell/platform/linux/fl_settings_channel.h +++ b/shell/platform/linux/fl_settings_channel.h @@ -10,10 +10,8 @@ G_BEGIN_DECLS typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_SETTINGS_CHANNEL_PLATFORM_BRIGHTNESS_LIGHT, FL_SETTINGS_CHANNEL_PLATFORM_BRIGHTNESS_DARK - // NOLINTEND(readability-identifier-naming) } FlSettingsChannelPlatformBrightness; G_DECLARE_FINAL_TYPE(FlSettingsChannel, diff --git a/shell/platform/linux/fl_standard_method_codec.cc b/shell/platform/linux/fl_standard_method_codec.cc index 46a803a041aaa..cd2b8b6a19c06 100644 --- a/shell/platform/linux/fl_standard_method_codec.cc +++ b/shell/platform/linux/fl_standard_method_codec.cc @@ -21,7 +21,7 @@ struct _FlStandardMethodCodec { FlStandardMessageCodec* message_codec; }; -enum { kPropMessageCodec = 1, kPropLast }; +enum { PROP_MESSAGE_CODEC = 1, PROP_LAST }; G_DEFINE_TYPE(FlStandardMethodCodec, fl_standard_method_codec, @@ -34,7 +34,7 @@ static void fl_standard_method_codec_set_property(GObject* object, FlStandardMethodCodec* self = FL_STANDARD_METHOD_CODEC(object); switch (prop_id) { - case kPropMessageCodec: + case PROP_MESSAGE_CODEC: g_set_object(&self->message_codec, FL_STANDARD_MESSAGE_CODEC(g_value_get_object(value))); break; @@ -51,7 +51,7 @@ static void fl_standard_method_codec_get_property(GObject* object, FlStandardMethodCodec* self = FL_STANDARD_METHOD_CODEC(object); switch (prop_id) { - case kPropMessageCodec: + case PROP_MESSAGE_CODEC: g_value_set_object(value, self->message_codec); break; default: @@ -278,7 +278,7 @@ static void fl_standard_method_codec_class_init( fl_standard_method_codec_decode_response; g_object_class_install_property( - G_OBJECT_CLASS(klass), kPropMessageCodec, + G_OBJECT_CLASS(klass), PROP_MESSAGE_CODEC, g_param_spec_object( "message-codec", "message-codec", "Message codec to use", fl_message_codec_get_type(), diff --git a/shell/platform/linux/fl_text_input_channel.h b/shell/platform/linux/fl_text_input_channel.h index fad0cd5e9be03..566cd8a06549e 100644 --- a/shell/platform/linux/fl_text_input_channel.h +++ b/shell/platform/linux/fl_text_input_channel.h @@ -12,20 +12,16 @@ G_BEGIN_DECLS typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_TEXT_INPUT_TYPE_TEXT, // Send newline when multi-line and enter is pressed. FL_TEXT_INPUT_TYPE_MULTILINE, // The input method is not shown at all. FL_TEXT_INPUT_TYPE_NONE, - // NOLINTEND(readability-identifier-naming) } FlTextInputType; typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_TEXT_AFFINITY_UPSTREAM, FL_TEXT_AFFINITY_DOWNSTREAM, - // NOLINTEND(readability-identifier-naming) } FlTextAffinity; G_DECLARE_FINAL_TYPE(FlTextInputChannel, diff --git a/shell/platform/linux/fl_view.cc b/shell/platform/linux/fl_view.cc index a5aca2279a0c4..be8cdd7f2051a 100644 --- a/shell/platform/linux/fl_view.cc +++ b/shell/platform/linux/fl_view.cc @@ -77,9 +77,9 @@ struct _FlView { GCancellable* cancellable; }; -enum { kSignalFirstFrame, kSignalLastSignal }; +enum { SIGNAL_FIRST_FRAME, LAST_SIGNAL }; -static guint fl_view_signals[kSignalLastSignal]; +static guint fl_view_signals[LAST_SIGNAL]; static void fl_renderable_iface_init(FlRenderableInterface* iface); @@ -108,7 +108,7 @@ G_DEFINE_TYPE_WITH_CODE( static gboolean first_frame_idle_cb(gpointer user_data) { FlView* self = FL_VIEW(user_data); - g_signal_emit(self, fl_view_signals[kSignalFirstFrame], 0); + g_signal_emit(self, fl_view_signals[SIGNAL_FIRST_FRAME], 0); return FALSE; } @@ -665,7 +665,7 @@ static void fl_view_class_init(FlViewClass* klass) { widget_class->key_press_event = fl_view_key_press_event; widget_class->key_release_event = fl_view_key_release_event; - fl_view_signals[kSignalFirstFrame] = + fl_view_signals[SIGNAL_FIRST_FRAME] = g_signal_new("first-frame", fl_view_get_type(), G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); diff --git a/shell/platform/linux/fl_view_accessible.cc b/shell/platform/linux/fl_view_accessible.cc index 09bb83930fb24..13012681eea32 100644 --- a/shell/platform/linux/fl_view_accessible.cc +++ b/shell/platform/linux/fl_view_accessible.cc @@ -22,8 +22,6 @@ struct _FlViewAccessible { gboolean root_node_created; }; -enum { kProp0, kPropEngine, kPropLast }; - G_DEFINE_TYPE(FlViewAccessible, fl_view_accessible, ATK_TYPE_PLUG) static FlAccessibleNode* create_node(FlViewAccessible* self, diff --git a/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h b/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h index bdff02d40d471..adc11f71b8e04 100644 --- a/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h +++ b/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS typedef enum { // Part of the public API, so fixing the name is a breaking change. - // NOLINTNEXTLINE(readability-identifier-naming) FL_BINARY_MESSENGER_ERROR_ALREADY_RESPONDED, } FlBinaryMessengerError; diff --git a/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h b/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h index 9ffe7ea9526ce..0560511ecb291 100644 --- a/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h +++ b/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h @@ -27,11 +27,9 @@ G_BEGIN_DECLS #define FL_JSON_MESSAGE_CODEC_ERROR fl_json_message_codec_error_quark() typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_JSON_MESSAGE_CODEC_ERROR_INVALID_UTF8, FL_JSON_MESSAGE_CODEC_ERROR_INVALID_JSON, FL_JSON_MESSAGE_CODEC_ERROR_INVALID_OBJECT_KEY_TYPE, - // NOLINTEND(readability-identifier-naming) } FlJsonMessageCodecError; G_MODULE_EXPORT diff --git a/shell/platform/linux/public/flutter_linux/fl_message_codec.h b/shell/platform/linux/public/flutter_linux/fl_message_codec.h index fd93345e79e73..1ab5627952bdc 100644 --- a/shell/platform/linux/public/flutter_linux/fl_message_codec.h +++ b/shell/platform/linux/public/flutter_linux/fl_message_codec.h @@ -30,12 +30,10 @@ G_BEGIN_DECLS #define FL_MESSAGE_CODEC_ERROR fl_message_codec_error_quark() typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_MESSAGE_CODEC_ERROR_FAILED, FL_MESSAGE_CODEC_ERROR_OUT_OF_DATA, FL_MESSAGE_CODEC_ERROR_ADDITIONAL_DATA, FL_MESSAGE_CODEC_ERROR_UNSUPPORTED_TYPE, - // NOLINTEND(readability-identifier-naming) } FlMessageCodecError; G_MODULE_EXPORT diff --git a/shell/platform/linux/public/flutter_linux/fl_method_response.h b/shell/platform/linux/public/flutter_linux/fl_method_response.h index 5e595a2a6fa44..c7ceecec9aaf8 100644 --- a/shell/platform/linux/public/flutter_linux/fl_method_response.h +++ b/shell/platform/linux/public/flutter_linux/fl_method_response.h @@ -30,11 +30,9 @@ G_BEGIN_DECLS #define FL_METHOD_RESPONSE_ERROR fl_method_response_error_quark() typedef enum { - // NOLINTBEGIN(readability-identifier-naming) FL_METHOD_RESPONSE_ERROR_FAILED, FL_METHOD_RESPONSE_ERROR_REMOTE_ERROR, FL_METHOD_RESPONSE_ERROR_NOT_IMPLEMENTED, - // NOLINTEND(readability-identifier-naming) } FlMethodResponseError; G_MODULE_EXPORT diff --git a/shell/platform/linux/public/flutter_linux/fl_value.h b/shell/platform/linux/public/flutter_linux/fl_value.h index 21fe7074e8cea..86a2f9c25973c 100644 --- a/shell/platform/linux/public/flutter_linux/fl_value.h +++ b/shell/platform/linux/public/flutter_linux/fl_value.h @@ -61,7 +61,6 @@ typedef struct _FlValue FlValue; */ typedef enum { // Parts of the public API, so fixing the names is a breaking change. - // NOLINTBEGIN(readability-identifier-naming) FL_VALUE_TYPE_NULL, FL_VALUE_TYPE_BOOL, FL_VALUE_TYPE_INT, @@ -75,7 +74,6 @@ typedef enum { FL_VALUE_TYPE_MAP, FL_VALUE_TYPE_FLOAT32_LIST, FL_VALUE_TYPE_CUSTOM, - // NOLINTEND(readability-identifier-naming) } FlValueType; /** From c79a8f731035d4170f3ee7b1b449c89877682854 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 21 Nov 2024 11:40:52 +1300 Subject: [PATCH 3/4] Conver two more enums --- .../linux/fl_key_embedder_responder.cc | 19 ++++++++++--------- shell/platform/linux/fl_settings_portal.cc | 8 ++++++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/shell/platform/linux/fl_key_embedder_responder.cc b/shell/platform/linux/fl_key_embedder_responder.cc index 4118b6c1ddaa2..1f714acdc59b2 100644 --- a/shell/platform/linux/fl_key_embedder_responder.cc +++ b/shell/platform/linux/fl_key_embedder_responder.cc @@ -125,9 +125,9 @@ static FlKeyEmbedderUserData* fl_key_embedder_user_data_new( namespace { typedef enum { - kStateLogicUndecided, - kStateLogicNormal, - kStateLogicReversed, + STATE_LOGIC_INFERRENCE_UNDECIDED, + STATE_LOGIC_INFERRENCE_NORMAL, + STATE_LOGIC_INFERRENCE_REVERSED, } StateLogicInferrence; } @@ -246,7 +246,7 @@ FlKeyEmbedderResponder* fl_key_embedder_responder_new( self->pressing_records = g_hash_table_new(g_direct_hash, g_direct_equal); self->mapping_records = g_hash_table_new(g_direct_hash, g_direct_equal); self->lock_records = 0; - self->caps_lock_state_logic_inferrence = kStateLogicUndecided; + self->caps_lock_state_logic_inferrence = STATE_LOGIC_INFERRENCE_UNDECIDED; self->modifier_bit_to_checked_keys = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free); @@ -557,7 +557,8 @@ static void update_caps_lock_state_logic_inferrence( bool is_down_event, bool enabled_by_state, int stage_by_record) { - if (self->caps_lock_state_logic_inferrence != kStateLogicUndecided) { + if (self->caps_lock_state_logic_inferrence != + STATE_LOGIC_INFERRENCE_UNDECIDED) { return; } if (!is_down_event) { @@ -567,9 +568,9 @@ static void update_caps_lock_state_logic_inferrence( stage_by_record, is_down_event, enabled_by_state, false); if ((stage_by_event == 0 && stage_by_record == 2) || (stage_by_event == 2 && stage_by_record == 0)) { - self->caps_lock_state_logic_inferrence = kStateLogicReversed; + self->caps_lock_state_logic_inferrence = STATE_LOGIC_INFERRENCE_REVERSED; } else { - self->caps_lock_state_logic_inferrence = kStateLogicNormal; + self->caps_lock_state_logic_inferrence = STATE_LOGIC_INFERRENCE_NORMAL; } } @@ -639,11 +640,11 @@ static void synchronize_lock_states_loop_body(gpointer key, update_caps_lock_state_logic_inferrence(self, context->is_down, enabled_by_state, stage_by_record); g_return_if_fail(self->caps_lock_state_logic_inferrence != - kStateLogicUndecided); + STATE_LOGIC_INFERRENCE_UNDECIDED); } const bool reverse_state_logic = checked_key->is_caps_lock && - self->caps_lock_state_logic_inferrence == kStateLogicReversed; + self->caps_lock_state_logic_inferrence == STATE_LOGIC_INFERRENCE_REVERSED; const int stage_by_event = this_key_is_event_key ? find_stage_by_self_event(stage_by_record, context->is_down, diff --git a/shell/platform/linux/fl_settings_portal.cc b/shell/platform/linux/fl_settings_portal.cc index a3eded35263d7..3df731bbf4b4b 100644 --- a/shell/platform/linux/fl_settings_portal.cc +++ b/shell/platform/linux/fl_settings_portal.cc @@ -62,7 +62,11 @@ static const FlSetting kAllSettings[] = { static constexpr char kClockFormat12Hour[] = "12h"; static constexpr char kGtkThemeDarkSuffix[] = "-dark"; -typedef enum { kDefault, kPreferDark, kPreferLight } ColorScheme; +typedef enum { + COLOR_SCHEME_DEFAULT, + COLOR_SCHEME_PREFER_DARK, + COLOR_SCHEME_PREFER_LIGHT +} ColorScheme; struct _FlSettingsPortal { GObject parent_instance; @@ -183,7 +187,7 @@ static FlColorScheme fl_settings_portal_get_color_scheme(FlSettings* settings) { g_autoptr(GVariant) value = nullptr; if (get_value(self, &kColorScheme, &value)) { - if (g_variant_get_uint32(value) == kPreferDark) { + if (g_variant_get_uint32(value) == COLOR_SCHEME_PREFER_DARK) { color_scheme = FL_COLOR_SCHEME_DARK; } } else if (get_value(self, &kGtkTheme, &value)) { From fe1995221fa21d8ba64e62379a4b150570ac5dfd Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 21 Nov 2024 13:20:59 +1300 Subject: [PATCH 4/4] One more enum --- .../linux/fl_keyboard_manager_test.cc | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/shell/platform/linux/fl_keyboard_manager_test.cc b/shell/platform/linux/fl_keyboard_manager_test.cc index d63715c2bd3ca..e1044fa44bcd2 100644 --- a/shell/platform/linux/fl_keyboard_manager_test.cc +++ b/shell/platform/linux/fl_keyboard_manager_test.cc @@ -25,7 +25,7 @@ // stacktrace wouldn't print where the function is called in the unit tests. #define EXPECT_KEY_EVENT(RECORD, TYPE, PHYSICAL, LOGICAL, CHAR, SYNTHESIZED) \ - EXPECT_EQ((RECORD).type, CallRecord::kKeyCallEmbedder); \ + EXPECT_EQ((RECORD).type, CallRecord::KEY_CALL_EMBEDDER); \ EXPECT_EQ((RECORD).event->type, (TYPE)); \ EXPECT_EQ((RECORD).event->physical, (PHYSICAL)); \ EXPECT_EQ((RECORD).event->logical, (LOGICAL)); \ @@ -33,7 +33,7 @@ EXPECT_EQ((RECORD).event->synthesized, (SYNTHESIZED)); #define VERIFY_DOWN(OUT_LOGICAL, OUT_CHAR) \ - EXPECT_EQ(call_records[0].type, CallRecord::kKeyCallEmbedder); \ + EXPECT_EQ(call_records[0].type, CallRecord::KEY_CALL_EMBEDDER); \ EXPECT_EQ(call_records[0].event->type, kFlutterKeyEventTypeDown); \ EXPECT_EQ(call_records[0].event->logical, (OUT_LOGICAL)); \ EXPECT_STREQ(call_records[0].event->character, (OUT_CHAR)); \ @@ -78,8 +78,8 @@ typedef std::function RedispatchHandler; // An instance of `CallRecord` might not have all the fields filled. typedef struct { enum { - kKeyCallEmbedder, - kKeyCallChannel, + KEY_CALL_EMBEDDER, + KEY_CALL_CHANNEL, } type; AsyncKeyCallback callback; @@ -436,7 +436,7 @@ class KeyboardTester { char* new_event_character = cloneString(event->character); new_event->character = new_event_character; storage.push_back(CallRecord{ - .type = CallRecord::kKeyCallEmbedder, + .type = CallRecord::KEY_CALL_EMBEDDER, .callback = std::move(callback), .event = std::move(new_event), .event_character = std::unique_ptr(new_event_character), @@ -455,7 +455,7 @@ class KeyboardTester { char* new_event_character = cloneString(event->character); new_event->character = new_event_character; storage.push_back(CallRecord{ - .type = CallRecord::kKeyCallEmbedder, + .type = CallRecord::KEY_CALL_EMBEDDER, .event = std::move(new_event), .event_character = std::unique_ptr(new_event_character), }); @@ -476,7 +476,7 @@ class KeyboardTester { messenger_, [&storage, this](AsyncKeyCallback callback) { EXPECT_FALSE(during_redispatch_); storage.push_back(CallRecord{ - .type = CallRecord::kKeyCallChannel, + .type = CallRecord::KEY_CALL_CHANNEL, .callback = std::move(callback), }); }); @@ -703,8 +703,8 @@ TEST(FlKeyboardManagerTest, WithTwoAsyncDelegates) { EXPECT_EQ(redispatched->len, 0u); EXPECT_EQ(call_records.size(), 2u); - EXPECT_EQ(call_records[0].type, CallRecord::kKeyCallEmbedder); - EXPECT_EQ(call_records[1].type, CallRecord::kKeyCallChannel); + EXPECT_EQ(call_records[0].type, CallRecord::KEY_CALL_EMBEDDER); + EXPECT_EQ(call_records[1].type, CallRecord::KEY_CALL_CHANNEL); call_records[0].callback(true); call_records[1].callback(false); @@ -723,8 +723,8 @@ TEST(FlKeyboardManagerTest, WithTwoAsyncDelegates) { EXPECT_EQ(redispatched->len, 0u); EXPECT_EQ(call_records.size(), 2u); - EXPECT_EQ(call_records[0].type, CallRecord::kKeyCallEmbedder); - EXPECT_EQ(call_records[1].type, CallRecord::kKeyCallChannel); + EXPECT_EQ(call_records[0].type, CallRecord::KEY_CALL_EMBEDDER); + EXPECT_EQ(call_records[1].type, CallRecord::KEY_CALL_CHANNEL); call_records[0].callback(false); call_records[1].callback(false);