firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow GTK style enum naming (flutter/engine#56731)

Browse Source 
Remove the linting overrides for enum names and set this in the
clang-format file.
This commit is contained in:
Robert Ancell 2024-11-21 15:16:43 +13:00 committed by GitHub
parent de98354d8e
commit 504bff9b26
24 changed files with 72 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/flutter/shell/platform/linux/.clang-tidy
View File

@ -3,3 +3,9 @@ InheritParentConfig: true
# EnumCastOutOfRange warns about some common usages of GTK macros # EnumCastOutOfRange warns about some common usages of GTK macros
Checks: >- 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: ""

10
engine/src/flutter/shell/platform/linux/fl_accessible_node.cc
View File

@ -81,7 +81,7 @@ struct FlAccessibleNodePrivate {
FlutterSemanticsFlag flags; FlutterSemanticsFlag flags;
}; };
enum { kProp0, kPropEngine, kPropId, kPropLast }; enum { PROP_0, PROP_ENGINE, PROP_ID, PROP_LAST };
#define FL_ACCESSIBLE_NODE_GET_PRIVATE(node) \ #define FL_ACCESSIBLE_NODE_GET_PRIVATE(node) \
((FlAccessibleNodePrivate*)fl_accessible_node_get_instance_private( \ ((FlAccessibleNodePrivate*)fl_accessible_node_get_instance_private( \
@ -145,13 +145,13 @@ static void fl_accessible_node_set_property(GObject* object,
GParamSpec* pspec) { GParamSpec* pspec) {
FlAccessibleNodePrivate* priv = FL_ACCESSIBLE_NODE_GET_PRIVATE(object); FlAccessibleNodePrivate* priv = FL_ACCESSIBLE_NODE_GET_PRIVATE(object);
switch (prop_id) { switch (prop_id) {
case kPropEngine: case PROP_ENGINE:
g_assert(priv->engine == nullptr); g_assert(priv->engine == nullptr);
priv->engine = FL_ENGINE(g_value_get_object(value)); priv->engine = FL_ENGINE(g_value_get_object(value));
g_object_add_weak_pointer(object, g_object_add_weak_pointer(object,
reinterpret_cast<gpointer*>(&priv->engine)); reinterpret_cast<gpointer*>(&priv->engine));
break; break;
case kPropId: case PROP_ID:
priv->id = g_value_get_int(value); priv->id = g_value_get_int(value);
break; break;
default: default:
@ -448,13 +448,13 @@ static void fl_accessible_node_class_init(FlAccessibleNodeClass* klass) {
fl_accessible_node_perform_action_impl; fl_accessible_node_perform_action_impl;
g_object_class_install_property( g_object_class_install_property(
G_OBJECT_CLASS(klass), kPropEngine, G_OBJECT_CLASS(klass), PROP_ENGINE,
g_param_spec_object( g_param_spec_object(
"engine", "engine", "Flutter engine", fl_engine_get_type(), "engine", "engine", "Flutter engine", fl_engine_get_type(),
static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS))); G_PARAM_STATIC_STRINGS)));
g_object_class_install_property( g_object_class_install_property(
G_OBJECT_CLASS(klass), kPropId, G_OBJECT_CLASS(klass), PROP_ID,
g_param_spec_int( g_param_spec_int(
"id", "id", "Accessibility node ID", 0, G_MAXINT, 0, "id", "id", "Accessibility node ID", 0, G_MAXINT, 0,
static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |

12
engine/src/flutter/shell/platform/linux/fl_application.cc
View File

@ -22,9 +22,9 @@ struct FlApplicationPrivate {
((FlApplicationPrivate*)fl_application_get_instance_private( \ ((FlApplicationPrivate*)fl_application_get_instance_private( \
FL_APPLICATION(app))) 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, G_DEFINE_TYPE_WITH_CODE(FlApplication,
fl_application, fl_application,
@ -95,14 +95,14 @@ static void fl_application_activate(GApplication* application) {
gtk_widget_show(GTK_WIDGET(view)); gtk_widget_show(GTK_WIDGET(view));
GtkWindow* window; 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); &window);
// Make the resources for the view so rendering can start. // Make the resources for the view so rendering can start.
// We'll show the view when we have the first frame. // We'll show the view when we have the first frame.
gtk_widget_realize(GTK_WIDGET(view)); 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)); FL_PLUGIN_REGISTRY(view));
} }
@ -150,11 +150,11 @@ static void fl_application_class_init(FlApplicationClass* klass) {
klass->register_plugins = fl_application_register_plugins; klass->register_plugins = fl_application_register_plugins;
klass->create_window = fl_application_create_window; 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, "register-plugins", fl_application_get_type(), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(FlApplicationClass, register_plugins), nullptr, nullptr, G_STRUCT_OFFSET(FlApplicationClass, register_plugins), nullptr, nullptr,
nullptr, G_TYPE_NONE, 1, fl_plugin_registry_get_type()); 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, "create-window", fl_application_get_type(), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(FlApplicationClass, create_window), G_STRUCT_OFFSET(FlApplicationClass, create_window),
g_signal_accumulator_first_wins, nullptr, nullptr, GTK_TYPE_WINDOW, 1, g_signal_accumulator_first_wins, nullptr, nullptr, GTK_TYPE_WINDOW, 1,

14
engine/src/flutter/shell/platform/linux/fl_engine.cc
View File

@ -92,9 +92,9 @@ G_DEFINE_QUARK(fl_engine_error_quark, fl_engine_error)
static void fl_engine_plugin_registry_iface_init( static void fl_engine_plugin_registry_iface_init(
FlPluginRegistryInterface* iface); 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( G_DEFINE_TYPE_WITH_CODE(
FlEngine, FlEngine,
@ -103,7 +103,7 @@ G_DEFINE_TYPE_WITH_CODE(
G_IMPLEMENT_INTERFACE(fl_plugin_registry_get_type(), G_IMPLEMENT_INTERFACE(fl_plugin_registry_get_type(),
fl_engine_plugin_registry_iface_init)) fl_engine_plugin_registry_iface_init))
enum { kProp0, kPropBinaryMessenger, kPropLast }; enum { PROP_0, PROP_BINARY_MESSENGER, PROP_LAST };
// Parse a locale into its components. // Parse a locale into its components.
static void parse_locale(const gchar* locale, 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) { static void fl_engine_on_pre_engine_restart_cb(void* user_data) {
FlEngine* self = FL_ENGINE(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 // 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) { GParamSpec* pspec) {
FlEngine* self = FL_ENGINE(object); FlEngine* self = FL_ENGINE(object);
switch (prop_id) { switch (prop_id) {
case kPropBinaryMessenger: case PROP_BINARY_MESSENGER:
g_set_object(&self->binary_messenger, g_set_object(&self->binary_messenger,
FL_BINARY_MESSENGER(g_value_get_object(value))); FL_BINARY_MESSENGER(g_value_get_object(value)));
break; 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(klass)->set_property = fl_engine_set_property;
g_object_class_install_property( g_object_class_install_property(
G_OBJECT_CLASS(klass), kPropBinaryMessenger, G_OBJECT_CLASS(klass), PROP_BINARY_MESSENGER,
g_param_spec_object( g_param_spec_object(
"binary-messenger", "messenger", "Binary messenger", "binary-messenger", "messenger", "Binary messenger",
fl_binary_messenger_get_type(), fl_binary_messenger_get_type(),
static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS))); 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, "on-pre-engine-restart", fl_engine_get_type(), G_SIGNAL_RUN_LAST, 0,
nullptr, nullptr, nullptr, G_TYPE_NONE, 0); nullptr, nullptr, nullptr, G_TYPE_NONE, 0);
} }

2
engine/src/flutter/shell/platform/linux/fl_engine_private.h
View File

@ -22,9 +22,7 @@ G_BEGIN_DECLS
*/ */
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_ENGINE_ERROR_FAILED, FL_ENGINE_ERROR_FAILED,
// NOLINTEND(readability-identifier-naming)
} FlEngineError; } FlEngineError;
GQuark fl_engine_error_quark(void) G_GNUC_CONST; GQuark fl_engine_error_quark(void) G_GNUC_CONST;

6
engine/src/flutter/shell/platform/linux/fl_gnome_settings.cc
View File

@ -22,7 +22,7 @@ struct _FlGnomeSettings {
GSettings* interface_settings; GSettings* interface_settings;
}; };
enum { kProp0, kPropInterfaceSettings, kPropLast }; enum { PROP_0, PROP_INTERFACE_SETTINGS, PROP_LAST };
static void fl_gnome_settings_iface_init(FlSettingsInterface* iface); static void fl_gnome_settings_iface_init(FlSettingsInterface* iface);
@ -106,7 +106,7 @@ static void fl_gnome_settings_set_property(GObject* object,
GParamSpec* pspec) { GParamSpec* pspec) {
FlGnomeSettings* self = FL_GNOME_SETTINGS(object); FlGnomeSettings* self = FL_GNOME_SETTINGS(object);
switch (prop_id) { switch (prop_id) {
case kPropInterfaceSettings: case PROP_INTERFACE_SETTINGS:
fl_gnome_settings_set_interface_settings( fl_gnome_settings_set_interface_settings(
self, G_SETTINGS(g_value_get_object(value))); self, G_SETTINGS(g_value_get_object(value)));
break; break;
@ -130,7 +130,7 @@ static void fl_gnome_settings_class_init(FlGnomeSettingsClass* klass) {
object_class->set_property = fl_gnome_settings_set_property; object_class->set_property = fl_gnome_settings_set_property;
g_object_class_install_property( g_object_class_install_property(
object_class, kPropInterfaceSettings, object_class, PROP_INTERFACE_SETTINGS,
g_param_spec_object( g_param_spec_object(
kInterfaceSettings, kInterfaceSettings, kDesktopInterfaceSchema, kInterfaceSettings, kInterfaceSettings, kDesktopInterfaceSchema,
g_settings_get_type(), g_settings_get_type(),

19
engine/src/flutter/shell/platform/linux/fl_key_embedder_responder.cc
View File

@ -125,9 +125,9 @@ static FlKeyEmbedderUserData* fl_key_embedder_user_data_new(
namespace { namespace {
typedef enum { typedef enum {
kStateLogicUndecided, STATE_LOGIC_INFERRENCE_UNDECIDED,
kStateLogicNormal, STATE_LOGIC_INFERRENCE_NORMAL,
kStateLogicReversed, STATE_LOGIC_INFERRENCE_REVERSED,
} StateLogicInferrence; } 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->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->mapping_records = g_hash_table_new(g_direct_hash, g_direct_equal);
self->lock_records = 0; 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 = self->modifier_bit_to_checked_keys =
g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free); 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 is_down_event,
bool enabled_by_state, bool enabled_by_state,
int stage_by_record) { int stage_by_record) {
if (self->caps_lock_state_logic_inferrence != kStateLogicUndecided) { if (self->caps_lock_state_logic_inferrence !=
STATE_LOGIC_INFERRENCE_UNDECIDED) {
return; return;
} }
if (!is_down_event) { 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); stage_by_record, is_down_event, enabled_by_state, false);
if ((stage_by_event == 0 && stage_by_record == 2) || if ((stage_by_event == 0 && stage_by_record == 2) ||
(stage_by_event == 2 && stage_by_record == 0)) { (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 { } 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, update_caps_lock_state_logic_inferrence(self, context->is_down,
enabled_by_state, stage_by_record); enabled_by_state, stage_by_record);
g_return_if_fail(self->caps_lock_state_logic_inferrence != g_return_if_fail(self->caps_lock_state_logic_inferrence !=
kStateLogicUndecided); STATE_LOGIC_INFERRENCE_UNDECIDED);
} }
const bool reverse_state_logic = const bool reverse_state_logic =
checked_key->is_caps_lock && 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 = const int stage_by_event =
this_key_is_event_key this_key_is_event_key
? find_stage_by_self_event(stage_by_record, context->is_down, ? find_stage_by_self_event(stage_by_record, context->is_down,

22
engine/src/flutter/shell/platform/linux/fl_keyboard_manager_test.cc
View File

@ -25,7 +25,7 @@
// stacktrace wouldn't print where the function is called in the unit tests. // stacktrace wouldn't print where the function is called in the unit tests.
#define EXPECT_KEY_EVENT(RECORD, TYPE, PHYSICAL, LOGICAL, CHAR, SYNTHESIZED) \ #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->type, (TYPE)); \
EXPECT_EQ((RECORD).event->physical, (PHYSICAL)); \ EXPECT_EQ((RECORD).event->physical, (PHYSICAL)); \
EXPECT_EQ((RECORD).event->logical, (LOGICAL)); \ EXPECT_EQ((RECORD).event->logical, (LOGICAL)); \
@ -33,7 +33,7 @@
EXPECT_EQ((RECORD).event->synthesized, (SYNTHESIZED)); EXPECT_EQ((RECORD).event->synthesized, (SYNTHESIZED));
#define VERIFY_DOWN(OUT_LOGICAL, OUT_CHAR) \ #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->type, kFlutterKeyEventTypeDown); \
EXPECT_EQ(call_records[0].event->logical, (OUT_LOGICAL)); \ EXPECT_EQ(call_records[0].event->logical, (OUT_LOGICAL)); \
EXPECT_STREQ(call_records[0].event->character, (OUT_CHAR)); \ EXPECT_STREQ(call_records[0].event->character, (OUT_CHAR)); \
@ -78,8 +78,8 @@ typedef std::function<void(FlKeyEvent*)> RedispatchHandler;
// An instance of `CallRecord` might not have all the fields filled. // An instance of `CallRecord` might not have all the fields filled.
typedef struct { typedef struct {
enum { enum {
kKeyCallEmbedder, KEY_CALL_EMBEDDER,
kKeyCallChannel, KEY_CALL_CHANNEL,
} type; } type;
AsyncKeyCallback callback; AsyncKeyCallback callback;
@ -436,7 +436,7 @@ class KeyboardTester {
char* new_event_character = cloneString(event->character); char* new_event_character = cloneString(event->character);
new_event->character = new_event_character; new_event->character = new_event_character;
storage.push_back(CallRecord{ storage.push_back(CallRecord{
.type = CallRecord::kKeyCallEmbedder, .type = CallRecord::KEY_CALL_EMBEDDER,
.callback = std::move(callback), .callback = std::move(callback),
.event = std::move(new_event), .event = std::move(new_event),
.event_character = std::unique_ptr<char[]>(new_event_character), .event_character = std::unique_ptr<char[]>(new_event_character),
@ -455,7 +455,7 @@ class KeyboardTester {
char* new_event_character = cloneString(event->character); char* new_event_character = cloneString(event->character);
new_event->character = new_event_character; new_event->character = new_event_character;
storage.push_back(CallRecord{ storage.push_back(CallRecord{
.type = CallRecord::kKeyCallEmbedder, .type = CallRecord::KEY_CALL_EMBEDDER,
.event = std::move(new_event), .event = std::move(new_event),
.event_character = std::unique_ptr<char[]>(new_event_character), .event_character = std::unique_ptr<char[]>(new_event_character),
}); });
@ -476,7 +476,7 @@ class KeyboardTester {
messenger_, [&storage, this](AsyncKeyCallback callback) { messenger_, [&storage, this](AsyncKeyCallback callback) {
EXPECT_FALSE(during_redispatch_); EXPECT_FALSE(during_redispatch_);
storage.push_back(CallRecord{ storage.push_back(CallRecord{
.type = CallRecord::kKeyCallChannel, .type = CallRecord::KEY_CALL_CHANNEL,
.callback = std::move(callback), .callback = std::move(callback),
}); });
}); });
@ -703,8 +703,8 @@ TEST(FlKeyboardManagerTest, WithTwoAsyncDelegates) {
EXPECT_EQ(redispatched->len, 0u); EXPECT_EQ(redispatched->len, 0u);
EXPECT_EQ(call_records.size(), 2u); EXPECT_EQ(call_records.size(), 2u);
EXPECT_EQ(call_records[0].type, CallRecord::kKeyCallEmbedder); EXPECT_EQ(call_records[0].type, CallRecord::KEY_CALL_EMBEDDER);
EXPECT_EQ(call_records[1].type, CallRecord::kKeyCallChannel); EXPECT_EQ(call_records[1].type, CallRecord::KEY_CALL_CHANNEL);
call_records[0].callback(true); call_records[0].callback(true);
call_records[1].callback(false); call_records[1].callback(false);
@ -723,8 +723,8 @@ TEST(FlKeyboardManagerTest, WithTwoAsyncDelegates) {
EXPECT_EQ(redispatched->len, 0u); EXPECT_EQ(redispatched->len, 0u);
EXPECT_EQ(call_records.size(), 2u); EXPECT_EQ(call_records.size(), 2u);
EXPECT_EQ(call_records[0].type, CallRecord::kKeyCallEmbedder); EXPECT_EQ(call_records[0].type, CallRecord::KEY_CALL_EMBEDDER);
EXPECT_EQ(call_records[1].type, CallRecord::kKeyCallChannel); EXPECT_EQ(call_records[1].type, CallRecord::KEY_CALL_CHANNEL);
call_records[0].callback(false); call_records[0].callback(false);
call_records[1].callback(false); call_records[1].callback(false);

9
engine/src/flutter/shell/platform/linux/fl_mouse_cursor_handler.cc
View File

@ -21,9 +21,9 @@ struct _FlMouseCursorHandler {
gchar* cursor_name; 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) 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); g_free(self->cursor_name);
self->cursor_name = g_strdup(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) { static void fl_mouse_cursor_handler_dispose(GObject* object) {
@ -117,7 +118,7 @@ static void fl_mouse_cursor_handler_class_init(
FlMouseCursorHandlerClass* klass) { FlMouseCursorHandlerClass* klass) {
G_OBJECT_CLASS(klass)->dispose = fl_mouse_cursor_handler_dispose; 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_new("cursor-changed", fl_mouse_cursor_handler_get_type(),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
} }

4
engine/src/flutter/shell/platform/linux/fl_platform_channel.h
View File

@ -11,17 +11,13 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_PLATFORM_CHANNEL_EXIT_TYPE_CANCELABLE, FL_PLATFORM_CHANNEL_EXIT_TYPE_CANCELABLE,
FL_PLATFORM_CHANNEL_EXIT_TYPE_REQUIRED, FL_PLATFORM_CHANNEL_EXIT_TYPE_REQUIRED,
// NOLINTEND(readability-identifier-naming)
} FlPlatformChannelExitType; } FlPlatformChannelExitType;
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_PLATFORM_CHANNEL_EXIT_RESPONSE_CANCEL, FL_PLATFORM_CHANNEL_EXIT_RESPONSE_CANCEL,
FL_PLATFORM_CHANNEL_EXIT_RESPONSE_EXIT, FL_PLATFORM_CHANNEL_EXIT_RESPONSE_EXIT,
// NOLINTEND(readability-identifier-naming)
} FlPlatformChannelExitResponse; } FlPlatformChannelExitResponse;
G_DECLARE_FINAL_TYPE(FlPlatformChannel, G_DECLARE_FINAL_TYPE(FlPlatformChannel,

2
engine/src/flutter/shell/platform/linux/fl_renderer.h
View File

@ -20,9 +20,7 @@ G_BEGIN_DECLS
*/ */
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_RENDERER_ERROR_FAILED, FL_RENDERER_ERROR_FAILED,
// NOLINTEND(readability-identifier-naming)
} FlRendererError; } FlRendererError;
GQuark fl_renderer_error_quark(void) G_GNUC_CONST; GQuark fl_renderer_error_quark(void) G_GNUC_CONST;

10
engine/src/flutter/shell/platform/linux/fl_settings.cc
View File

@ -9,11 +9,11 @@
G_DEFINE_INTERFACE(FlSettings, fl_settings, G_TYPE_OBJECT) G_DEFINE_INTERFACE(FlSettings, fl_settings, G_TYPE_OBJECT)
enum { enum {
kSignalChanged, SIGNAL_CHANGED,
kSignalLastSignal, LAST_SIGNAL,
}; };
static guint signals[kSignalLastSignal]; static guint signals[LAST_SIGNAL];
static void fl_settings_default_init(FlSettingsInterface* iface) { 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. * 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, g_signal_new("changed", G_TYPE_FROM_INTERFACE(iface), G_SIGNAL_RUN_LAST,
0, NULL, NULL, NULL, G_TYPE_NONE, 0); 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) { void fl_settings_emit_changed(FlSettings* self) {
g_return_if_fail(FL_IS_SETTINGS(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() { FlSettings* fl_settings_new() {

4
engine/src/flutter/shell/platform/linux/fl_settings.h
View File

@ -19,10 +19,8 @@ G_DECLARE_INTERFACE(FlSettings, fl_settings, FL, SETTINGS, GObject)
* Available clock formats. * Available clock formats.
*/ */
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_CLOCK_FORMAT_12H, FL_CLOCK_FORMAT_12H,
FL_CLOCK_FORMAT_24H, FL_CLOCK_FORMAT_24H,
// NOLINTEND(readability-identifier-naming)
} FlClockFormat; } FlClockFormat;
/** /**
@ -33,10 +31,8 @@ typedef enum {
* Available color schemes. * Available color schemes.
*/ */
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_COLOR_SCHEME_LIGHT, FL_COLOR_SCHEME_LIGHT,
FL_COLOR_SCHEME_DARK, FL_COLOR_SCHEME_DARK,
// NOLINTEND(readability-identifier-naming)
} FlColorScheme; } FlColorScheme;
/** /**

2
engine/src/flutter/shell/platform/linux/fl_settings_channel.h
View File

@ -10,10 +10,8 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_SETTINGS_CHANNEL_PLATFORM_BRIGHTNESS_LIGHT, FL_SETTINGS_CHANNEL_PLATFORM_BRIGHTNESS_LIGHT,
FL_SETTINGS_CHANNEL_PLATFORM_BRIGHTNESS_DARK FL_SETTINGS_CHANNEL_PLATFORM_BRIGHTNESS_DARK
// NOLINTEND(readability-identifier-naming)
} FlSettingsChannelPlatformBrightness; } FlSettingsChannelPlatformBrightness;
G_DECLARE_FINAL_TYPE(FlSettingsChannel, G_DECLARE_FINAL_TYPE(FlSettingsChannel,

8
engine/src/flutter/shell/platform/linux/fl_settings_portal.cc
View File

@ -62,7 +62,11 @@ static const FlSetting kAllSettings[] = {
static constexpr char kClockFormat12Hour[] = "12h"; static constexpr char kClockFormat12Hour[] = "12h";
static constexpr char kGtkThemeDarkSuffix[] = "-dark"; 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 { struct _FlSettingsPortal {
GObject parent_instance; GObject parent_instance;
@ -183,7 +187,7 @@ static FlColorScheme fl_settings_portal_get_color_scheme(FlSettings* settings) {
g_autoptr(GVariant) value = nullptr; g_autoptr(GVariant) value = nullptr;
if (get_value(self, &kColorScheme, &value)) { 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; color_scheme = FL_COLOR_SCHEME_DARK;
} }
} else if (get_value(self, &kGtkTheme, &value)) { } else if (get_value(self, &kGtkTheme, &value)) {

8
engine/src/flutter/shell/platform/linux/fl_standard_method_codec.cc
View File

@ -21,7 +21,7 @@ struct _FlStandardMethodCodec {
FlStandardMessageCodec* message_codec; FlStandardMessageCodec* message_codec;
}; };
enum { kPropMessageCodec = 1, kPropLast }; enum { PROP_MESSAGE_CODEC = 1, PROP_LAST };
G_DEFINE_TYPE(FlStandardMethodCodec, G_DEFINE_TYPE(FlStandardMethodCodec,
fl_standard_method_codec, 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); FlStandardMethodCodec* self = FL_STANDARD_METHOD_CODEC(object);
switch (prop_id) { switch (prop_id) {
case kPropMessageCodec: case PROP_MESSAGE_CODEC:
g_set_object(&self->message_codec, g_set_object(&self->message_codec,
FL_STANDARD_MESSAGE_CODEC(g_value_get_object(value))); FL_STANDARD_MESSAGE_CODEC(g_value_get_object(value)));
break; break;
@ -51,7 +51,7 @@ static void fl_standard_method_codec_get_property(GObject* object,
FlStandardMethodCodec* self = FL_STANDARD_METHOD_CODEC(object); FlStandardMethodCodec* self = FL_STANDARD_METHOD_CODEC(object);
switch (prop_id) { switch (prop_id) {
case kPropMessageCodec: case PROP_MESSAGE_CODEC:
g_value_set_object(value, self->message_codec); g_value_set_object(value, self->message_codec);
break; break;
default: default:
@ -278,7 +278,7 @@ static void fl_standard_method_codec_class_init(
fl_standard_method_codec_decode_response; fl_standard_method_codec_decode_response;
g_object_class_install_property( g_object_class_install_property(
G_OBJECT_CLASS(klass), kPropMessageCodec, G_OBJECT_CLASS(klass), PROP_MESSAGE_CODEC,
g_param_spec_object( g_param_spec_object(
"message-codec", "message-codec", "Message codec to use", "message-codec", "message-codec", "Message codec to use",
fl_message_codec_get_type(), fl_message_codec_get_type(),

4
engine/src/flutter/shell/platform/linux/fl_text_input_channel.h
View File

@ -12,20 +12,16 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_TEXT_INPUT_TYPE_TEXT, FL_TEXT_INPUT_TYPE_TEXT,
// Send newline when multi-line and enter is pressed. // Send newline when multi-line and enter is pressed.
FL_TEXT_INPUT_TYPE_MULTILINE, FL_TEXT_INPUT_TYPE_MULTILINE,
// The input method is not shown at all. // The input method is not shown at all.
FL_TEXT_INPUT_TYPE_NONE, FL_TEXT_INPUT_TYPE_NONE,
// NOLINTEND(readability-identifier-naming)
} FlTextInputType; } FlTextInputType;
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_TEXT_AFFINITY_UPSTREAM, FL_TEXT_AFFINITY_UPSTREAM,
FL_TEXT_AFFINITY_DOWNSTREAM, FL_TEXT_AFFINITY_DOWNSTREAM,
// NOLINTEND(readability-identifier-naming)
} FlTextAffinity; } FlTextAffinity;
G_DECLARE_FINAL_TYPE(FlTextInputChannel, G_DECLARE_FINAL_TYPE(FlTextInputChannel,

8
engine/src/flutter/shell/platform/linux/fl_view.cc
View File

@ -77,9 +77,9 @@ struct _FlView {
GCancellable* cancellable; 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); 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) { static gboolean first_frame_idle_cb(gpointer user_data) {
FlView* self = FL_VIEW(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; 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_press_event = fl_view_key_press_event;
widget_class->key_release_event = fl_view_key_release_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, g_signal_new("first-frame", fl_view_get_type(), G_SIGNAL_RUN_LAST, 0,
NULL, NULL, NULL, G_TYPE_NONE, 0); NULL, NULL, NULL, G_TYPE_NONE, 0);

2
engine/src/flutter/shell/platform/linux/fl_view_accessible.cc
View File

@ -22,8 +22,6 @@ struct _FlViewAccessible {
gboolean root_node_created; gboolean root_node_created;
}; };
enum { kProp0, kPropEngine, kPropLast };
G_DEFINE_TYPE(FlViewAccessible, fl_view_accessible, ATK_TYPE_PLUG) G_DEFINE_TYPE(FlViewAccessible, fl_view_accessible, ATK_TYPE_PLUG)
static FlAccessibleNode* create_node(FlViewAccessible* self, static FlAccessibleNode* create_node(FlViewAccessible* self,

1
engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h
View File

@ -28,7 +28,6 @@ G_BEGIN_DECLS
typedef enum { typedef enum {
// Part of the public API, so fixing the name is a breaking change. // Part of the public API, so fixing the name is a breaking change.
// NOLINTNEXTLINE(readability-identifier-naming)
FL_BINARY_MESSENGER_ERROR_ALREADY_RESPONDED, FL_BINARY_MESSENGER_ERROR_ALREADY_RESPONDED,
} FlBinaryMessengerError; } FlBinaryMessengerError;

2
engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h
View File

@ -27,11 +27,9 @@ G_BEGIN_DECLS
#define FL_JSON_MESSAGE_CODEC_ERROR fl_json_message_codec_error_quark() #define FL_JSON_MESSAGE_CODEC_ERROR fl_json_message_codec_error_quark()
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_JSON_MESSAGE_CODEC_ERROR_INVALID_UTF8, FL_JSON_MESSAGE_CODEC_ERROR_INVALID_UTF8,
FL_JSON_MESSAGE_CODEC_ERROR_INVALID_JSON, FL_JSON_MESSAGE_CODEC_ERROR_INVALID_JSON,
FL_JSON_MESSAGE_CODEC_ERROR_INVALID_OBJECT_KEY_TYPE, FL_JSON_MESSAGE_CODEC_ERROR_INVALID_OBJECT_KEY_TYPE,
// NOLINTEND(readability-identifier-naming)
} FlJsonMessageCodecError; } FlJsonMessageCodecError;
G_MODULE_EXPORT G_MODULE_EXPORT

2
engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_message_codec.h
View File

@ -30,12 +30,10 @@ G_BEGIN_DECLS
#define FL_MESSAGE_CODEC_ERROR fl_message_codec_error_quark() #define FL_MESSAGE_CODEC_ERROR fl_message_codec_error_quark()
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_MESSAGE_CODEC_ERROR_FAILED, FL_MESSAGE_CODEC_ERROR_FAILED,
FL_MESSAGE_CODEC_ERROR_OUT_OF_DATA, FL_MESSAGE_CODEC_ERROR_OUT_OF_DATA,
FL_MESSAGE_CODEC_ERROR_ADDITIONAL_DATA, FL_MESSAGE_CODEC_ERROR_ADDITIONAL_DATA,
FL_MESSAGE_CODEC_ERROR_UNSUPPORTED_TYPE, FL_MESSAGE_CODEC_ERROR_UNSUPPORTED_TYPE,
// NOLINTEND(readability-identifier-naming)
} FlMessageCodecError; } FlMessageCodecError;
G_MODULE_EXPORT G_MODULE_EXPORT

2
engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_method_response.h
View File

@ -30,11 +30,9 @@ G_BEGIN_DECLS
#define FL_METHOD_RESPONSE_ERROR fl_method_response_error_quark() #define FL_METHOD_RESPONSE_ERROR fl_method_response_error_quark()
typedef enum { typedef enum {
// NOLINTBEGIN(readability-identifier-naming)
FL_METHOD_RESPONSE_ERROR_FAILED, FL_METHOD_RESPONSE_ERROR_FAILED,
FL_METHOD_RESPONSE_ERROR_REMOTE_ERROR, FL_METHOD_RESPONSE_ERROR_REMOTE_ERROR,
FL_METHOD_RESPONSE_ERROR_NOT_IMPLEMENTED, FL_METHOD_RESPONSE_ERROR_NOT_IMPLEMENTED,
// NOLINTEND(readability-identifier-naming)
} FlMethodResponseError; } FlMethodResponseError;
G_MODULE_EXPORT G_MODULE_EXPORT

2
engine/src/flutter/shell/platform/linux/public/flutter_linux/fl_value.h
View File

@ -61,7 +61,6 @@ typedef struct _FlValue FlValue;
*/ */
typedef enum { typedef enum {
// Parts of the public API, so fixing the names is a breaking change. // Parts of the public API, so fixing the names is a breaking change.
// NOLINTBEGIN(readability-identifier-naming)
FL_VALUE_TYPE_NULL, FL_VALUE_TYPE_NULL,
FL_VALUE_TYPE_BOOL, FL_VALUE_TYPE_BOOL,
FL_VALUE_TYPE_INT, FL_VALUE_TYPE_INT,
@ -75,7 +74,6 @@ typedef enum {
FL_VALUE_TYPE_MAP, FL_VALUE_TYPE_MAP,
FL_VALUE_TYPE_FLOAT32_LIST, FL_VALUE_TYPE_FLOAT32_LIST,
FL_VALUE_TYPE_CUSTOM, FL_VALUE_TYPE_CUSTOM,
// NOLINTEND(readability-identifier-naming)
} FlValueType; } FlValueType;
/** /**