Skip to content

Commit 6a72acd

Browse files
swift-kimswift-kim
authored
Minimize use of reinterpret_cast (#27)
1 parent a152671 commit 6a72acd

12 files changed

+71
-80
lines changed

‎flutter/shell/platform/tizen/accessibility_settings.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void AccessibilitySettings::OnHighContrastStateChanged(
5959
system_settings_key_e key,
6060
void* user_data) {
6161
#ifdef TV_PROFILE
62-
auto* self = reinterpret_cast<AccessibilitySettings*>(user_data);
62+
auto* self = static_cast<AccessibilitySettings*>(user_data);
6363

6464
int enabled = 0;
6565
int ret = system_settings_get_value_int(
@@ -77,7 +77,7 @@ void AccessibilitySettings::OnScreenReaderStateChanged(
7777
system_settings_key_e key,
7878
void* user_data) {
7979
#ifndef WEARABLE_PROFILE
80-
auto* self = reinterpret_cast<AccessibilitySettings*>(user_data);
80+
auto* self = static_cast<AccessibilitySettings*>(user_data);
8181

8282
bool enabled = false;
8383
int ret = system_settings_get_value_bool(key, &enabled);

‎flutter/shell/platform/tizen/channels/app_control.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int32_t NativeCreateAppControl(Dart_Handle handle) {
2020
Dart_NewFinalizableHandle_DL(
2121
handle, app_control.get(), 64,
2222
[](void* isolate_callback_data, void* peer) {
23-
auto* app_control = reinterpret_cast<flutter::AppControl*>(peer);
23+
auto* app_control = static_cast<flutter::AppControl*>(peer);
2424
flutter::AppControlManager::GetInstance().Remove(app_control->id());
2525
});
2626
flutter::AppControlManager::GetInstance().Insert(std::move(app_control));
@@ -34,7 +34,7 @@ bool NativeAttachAppControl(int32_t id, Dart_Handle handle) {
3434
}
3535
Dart_NewFinalizableHandle_DL(
3636
handle, app_control, 64, [](void* isolate_callback_data, void* peer) {
37-
auto* app_control = reinterpret_cast<flutter::AppControl*>(peer);
37+
auto* app_control = static_cast<flutter::AppControl*>(peer);
3838
flutter::AppControlManager::GetInstance().Remove(app_control->id());
3939
});
4040
return true;

‎flutter/shell/platform/tizen/channels/key_event_channel.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,7 @@ void KeyEventChannel::SendEmbedderEvent(const char* key,
250250
send_event_(
251251
event,
252252
[](bool handled, void* user_data) {
253-
auto* callback =
254-
reinterpret_cast<std::function<void(bool)>*>(user_data);
253+
auto* callback = static_cast<std::function<void(bool)>*>(user_data);
255254
(*callback)(handled);
256255
delete callback;
257256
},

‎flutter/shell/platform/tizen/channels/settings_channel.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ SettingsChannel::SettingsChannel(BinaryMessenger* messenger)
2828
system_settings_set_changed_cb(
2929
SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR,
3030
[](system_settings_key_e key, void* user_data) -> void {
31-
auto* self = reinterpret_cast<SettingsChannel*>(user_data);
31+
auto* self = static_cast<SettingsChannel*>(user_data);
3232
self->SendSettingsEvent();
3333
},
3434
this);
3535
system_settings_set_changed_cb(
3636
SYSTEM_SETTINGS_KEY_FONT_SIZE,
3737
[](system_settings_key_e key, void* user_data) -> void {
38-
auto* self = reinterpret_cast<SettingsChannel*>(user_data);
38+
auto* self = static_cast<SettingsChannel*>(user_data);
3939
self->SendSettingsEvent();
4040
},
4141
this);

‎flutter/shell/platform/tizen/flutter_tizen.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,7 @@ FlutterDesktopViewRef FlutterDesktopViewCreateFromNewWindow(
236236

237237
void* FlutterDesktopViewGetNativeHandle(FlutterDesktopViewRef view_ref) {
238238
flutter::FlutterTizenView* view = ViewFromHandle(view_ref);
239-
auto* tizen_view =
240-
reinterpret_cast<flutter::TizenViewBase*>(view->tizen_view());
241-
return tizen_view->GetNativeHandle();
239+
return view->tizen_view()->GetNativeHandle();
242240
}
243241

244242
void FlutterDesktopViewResize(FlutterDesktopViewRef view,

‎flutter/shell/platform/tizen/flutter_tizen_engine.cc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ bool FlutterTizenEngine::RunEngine() {
193193
<< engine_message->struct_size;
194194
return;
195195
}
196-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
196+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
197197
FlutterDesktopMessage message =
198198
engine->ConvertToDesktopMessage(*engine_message);
199199
engine->message_dispatcher_->HandleMessage(message);
@@ -215,7 +215,7 @@ bool FlutterTizenEngine::RunEngine() {
215215
if (IsHeaded() && dynamic_cast<TizenRendererEgl*>(renderer_.get())) {
216216
vsync_waiter_ = std::make_unique<TizenVsyncWaiter>(this);
217217
args.vsync_callback = [](void* user_data, intptr_t baton) -> void {
218-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
218+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
219219
engine->vsync_waiter_->AsyncWaitForVsync(baton);
220220
};
221221
}
@@ -430,51 +430,51 @@ FlutterRendererConfig FlutterTizenEngine::GetRendererConfig() {
430430
config.type = kOpenGL;
431431
config.open_gl.struct_size = sizeof(config.open_gl);
432432
config.open_gl.make_current = [](void* user_data) -> bool {
433-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
433+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
434434
if (!engine->view()) {
435435
return false;
436436
}
437437
return engine->view()->OnMakeCurrent();
438438
};
439439
config.open_gl.make_resource_current = [](void* user_data) -> bool {
440-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
440+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
441441
if (!engine->view()) {
442442
return false;
443443
}
444444
return engine->view()->OnMakeResourceCurrent();
445445
};
446446
config.open_gl.clear_current = [](void* user_data) -> bool {
447-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
447+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
448448
if (!engine->view()) {
449449
return false;
450450
}
451451
return engine->view()->OnClearCurrent();
452452
};
453453
config.open_gl.present = [](void* user_data) -> bool {
454-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
454+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
455455
if (!engine->view()) {
456456
return false;
457457
}
458458
return engine->view()->OnPresent();
459459
};
460460
config.open_gl.fbo_callback = [](void* user_data) -> uint32_t {
461-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
461+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
462462
if (!engine->view()) {
463463
return false;
464464
}
465465
return engine->view()->OnGetFBO();
466466
};
467467
config.open_gl.surface_transformation =
468468
[](void* user_data) -> FlutterTransformation {
469-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
469+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
470470
if (!engine->view()) {
471471
return FlutterTransformation();
472472
}
473473
return engine->view()->GetFlutterTransformation();
474474
};
475475
config.open_gl.gl_proc_resolver = [](void* user_data,
476476
const char* name) -> void* {
477-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
477+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
478478
if (!engine->view()) {
479479
return nullptr;
480480
}
@@ -483,7 +483,7 @@ FlutterRendererConfig FlutterTizenEngine::GetRendererConfig() {
483483
config.open_gl.gl_external_texture_frame_callback =
484484
[](void* user_data, int64_t texture_id, size_t width, size_t height,
485485
FlutterOpenGLTexture* texture) -> bool {
486-
auto* engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
486+
auto* engine = static_cast<FlutterTizenEngine*>(user_data);
487487
if (!engine->texture_registrar()) {
488488
return false;
489489
}

‎flutter/shell/platform/tizen/tizen_event_loop.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ TizenEventLoop::TizenEventLoop(std::thread::id main_thread_id,
1919
on_task_expired_(std::move(on_task_expired)) {
2020
ecore_pipe_ = ecore_pipe_add(
2121
[](void* data, void* buffer, unsigned int nbyte) -> void {
22-
auto* self = reinterpret_cast<TizenEventLoop*>(data);
22+
auto* self = static_cast<TizenEventLoop*>(data);
2323
self->ExecuteTaskEvents();
2424
},
2525
this);
@@ -79,7 +79,7 @@ void TizenEventLoop::PostTask(FlutterTask flutter_task,
7979
ecore_timer_add(
8080
flutter_duration / 1000000000.0,
8181
[](void* data) -> Eina_Bool {
82-
auto* self = reinterpret_cast<TizenEventLoop*>(data);
82+
auto* self = static_cast<TizenEventLoop*>(data);
8383
if (self->ecore_pipe_) {
8484
ecore_pipe_write(self->ecore_pipe_, nullptr, 0);
8585
}

‎flutter/shell/platform/tizen/tizen_input_method_context.cc‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -163,38 +163,34 @@ bool TizenInputMethodContext::HandleEcoreEventKey(Ecore_Event_Key* event,
163163
bool is_down) {
164164
FT_ASSERT(imf_context_);
165165
FT_ASSERT(event);
166+
167+
Ecore_IMF_Event imf_event;
166168
if (is_down) {
167-
Ecore_IMF_Event_Key_Down imf_event =
169+
imf_event.key_down =
168170
EcoreEventKeyToEcoreImfEvent<Ecore_IMF_Event_Key_Down>(event);
169-
return ecore_imf_context_filter_event(
170-
imf_context_, ECORE_IMF_EVENT_KEY_DOWN,
171-
reinterpret_cast<Ecore_IMF_Event*>(&imf_event));
171+
return ecore_imf_context_filter_event(imf_context_,
172+
ECORE_IMF_EVENT_KEY_DOWN, &imf_event);
172173
} else {
173-
Ecore_IMF_Event_Key_Up imf_event =
174+
imf_event.key_up =
174175
EcoreEventKeyToEcoreImfEvent<Ecore_IMF_Event_Key_Up>(event);
175-
return ecore_imf_context_filter_event(
176-
imf_context_, ECORE_IMF_EVENT_KEY_UP,
177-
reinterpret_cast<Ecore_IMF_Event*>(&imf_event));
176+
return ecore_imf_context_filter_event(imf_context_, ECORE_IMF_EVENT_KEY_UP,
177+
&imf_event);
178178
}
179179
}
180180

181181
bool TizenInputMethodContext::HandleEvasEventKeyDown(
182182
Evas_Event_Key_Down* event) {
183-
Ecore_IMF_Event_Key_Down imf_event;
184-
ecore_imf_evas_event_key_down_wrap(event, &imf_event);
185-
186-
return ecore_imf_context_filter_event(
187-
imf_context_, ECORE_IMF_EVENT_KEY_DOWN,
188-
reinterpret_cast<Ecore_IMF_Event*>(&imf_event));
183+
Ecore_IMF_Event imf_event;
184+
ecore_imf_evas_event_key_down_wrap(event, &imf_event.key_down);
185+
return ecore_imf_context_filter_event(imf_context_, ECORE_IMF_EVENT_KEY_DOWN,
186+
&imf_event);
189187
}
190188

191189
bool TizenInputMethodContext::HandleEvasEventKeyUp(Evas_Event_Key_Up* event) {
192-
Ecore_IMF_Event_Key_Up imf_event;
193-
ecore_imf_evas_event_key_up_wrap(event, &imf_event);
194-
195-
return ecore_imf_context_filter_event(
196-
imf_context_, ECORE_IMF_EVENT_KEY_UP,
197-
reinterpret_cast<Ecore_IMF_Event*>(&imf_event));
190+
Ecore_IMF_Event imf_event;
191+
ecore_imf_evas_event_key_up_wrap(event, &imf_event.key_up);
192+
return ecore_imf_context_filter_event(imf_context_, ECORE_IMF_EVENT_KEY_UP,
193+
&imf_event);
198194
}
199195

200196
#ifdef NUI_SUPPORT
@@ -226,18 +222,17 @@ bool TizenInputMethodContext::HandleNuiKeyEvent(const char* device_name,
226222
event.dev, static_cast<Ecore_IMF_Device_Subclass>(device_subclass));
227223
}
228224

225+
Ecore_IMF_Event imf_event;
229226
if (is_down) {
230-
Ecore_IMF_Event_Key_Down imf_event =
227+
imf_event.key_down =
231228
EcoreEventKeyToEcoreImfEvent<Ecore_IMF_Event_Key_Down>(&event);
232-
return ecore_imf_context_filter_event(
233-
imf_context_, ECORE_IMF_EVENT_KEY_DOWN,
234-
reinterpret_cast<Ecore_IMF_Event*>(&imf_event));
229+
return ecore_imf_context_filter_event(imf_context_,
230+
ECORE_IMF_EVENT_KEY_DOWN, &imf_event);
235231
} else {
236-
Ecore_IMF_Event_Key_Up imf_event =
232+
imf_event.key_up =
237233
EcoreEventKeyToEcoreImfEvent<Ecore_IMF_Event_Key_Up>(&event);
238-
return ecore_imf_context_filter_event(
239-
imf_context_, ECORE_IMF_EVENT_KEY_UP,
240-
reinterpret_cast<Ecore_IMF_Event*>(&imf_event));
234+
return ecore_imf_context_filter_event(imf_context_, ECORE_IMF_EVENT_KEY_UP,
235+
&imf_event);
241236
}
242237
}
243238
#endif

‎flutter/shell/platform/tizen/tizen_view_elementary.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void TizenViewElementary::DestroyView() {
105105
void TizenViewElementary::RegisterEventHandlers() {
106106
evas_object_callbacks_[EVAS_CALLBACK_RESIZE] =
107107
[](void* data, Evas* evas, Evas_Object* object, void* event_info) {
108-
auto* self = reinterpret_cast<TizenViewElementary*>(data);
108+
auto* self = static_cast<TizenViewElementary*>(data);
109109
if (self->view_delegate_) {
110110
if (self->container_ == object) {
111111
int32_t width = 0, height = 0;
@@ -127,7 +127,7 @@ void TizenViewElementary::RegisterEventHandlers() {
127127

128128
evas_object_callbacks_[EVAS_CALLBACK_MOUSE_DOWN] =
129129
[](void* data, Evas* evas, Evas_Object* object, void* event_info) {
130-
auto* self = reinterpret_cast<TizenViewElementary*>(data);
130+
auto* self = static_cast<TizenViewElementary*>(data);
131131
if (self->view_delegate_) {
132132
if (self->container_ == object) {
133133
auto* mouse_event =
@@ -147,7 +147,7 @@ void TizenViewElementary::RegisterEventHandlers() {
147147
evas_object_callbacks_[EVAS_CALLBACK_MOUSE_UP] = [](void* data, Evas* evas,
148148
Evas_Object* object,
149149
void* event_info) {
150-
auto* self = reinterpret_cast<TizenViewElementary*>(data);
150+
auto* self = static_cast<TizenViewElementary*>(data);
151151
if (self->view_delegate_) {
152152
if (self->container_ == object) {
153153
auto* mouse_event = reinterpret_cast<Evas_Event_Mouse_Up*>(event_info);
@@ -170,7 +170,7 @@ void TizenViewElementary::RegisterEventHandlers() {
170170
evas_object_callbacks_[EVAS_CALLBACK_MOUSE_MOVE] = [](void* data, Evas* evas,
171171
Evas_Object* object,
172172
void* event_info) {
173-
auto* self = reinterpret_cast<TizenViewElementary*>(data);
173+
auto* self = static_cast<TizenViewElementary*>(data);
174174
if (self->view_delegate_) {
175175
if (self->container_ == object) {
176176
auto* mouse_event =
@@ -195,7 +195,7 @@ void TizenViewElementary::RegisterEventHandlers() {
195195

196196
evas_object_callbacks_[EVAS_CALLBACK_MOUSE_WHEEL] =
197197
[](void* data, Evas* evas, Evas_Object* object, void* event_info) {
198-
auto* self = reinterpret_cast<TizenViewElementary*>(data);
198+
auto* self = static_cast<TizenViewElementary*>(data);
199199
if (self->view_delegate_) {
200200
if (self->container_ == object) {
201201
auto* wheel_event =
@@ -223,7 +223,7 @@ void TizenViewElementary::RegisterEventHandlers() {
223223
evas_object_callbacks_[EVAS_CALLBACK_KEY_DOWN] = [](void* data, Evas* evas,
224224
Evas_Object* object,
225225
void* event_info) {
226-
auto* self = reinterpret_cast<TizenViewElementary*>(data);
226+
auto* self = static_cast<TizenViewElementary*>(data);
227227
if (self->view_delegate_) {
228228
if (self->container_ == object && self->focused_) {
229229
auto* key_event = reinterpret_cast<Evas_Event_Key_Down*>(event_info);
@@ -249,7 +249,7 @@ void TizenViewElementary::RegisterEventHandlers() {
249249

250250
evas_object_callbacks_[EVAS_CALLBACK_KEY_UP] =
251251
[](void* data, Evas* evas, Evas_Object* object, void* event_info) {
252-
auto* self = reinterpret_cast<TizenViewElementary*>(data);
252+
auto* self = static_cast<TizenViewElementary*>(data);
253253
if (self->view_delegate_) {
254254
if (self->container_ == object && self->focused_) {
255255
auto* key_event = reinterpret_cast<Evas_Event_Key_Up*>(event_info);
@@ -274,7 +274,7 @@ void TizenViewElementary::RegisterEventHandlers() {
274274
this);
275275

276276
focused_callback_ = [](void* data, Evas_Object* object, void* event_info) {
277-
auto* self = reinterpret_cast<TizenViewElementary*>(data);
277+
auto* self = static_cast<TizenViewElementary*>(data);
278278
if (self->view_delegate_) {
279279
if (self->container_ == object) {
280280
self->focused_ = true;

‎flutter/shell/platform/tizen/tizen_vsync_waiter.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void TizenVsyncWaiter::SendMessage(int event, intptr_t baton) {
6666
}
6767

6868
void TizenVsyncWaiter::RunVblankLoop(void* data, Ecore_Thread* thread) {
69-
auto* self = reinterpret_cast<TizenVsyncWaiter*>(data);
69+
auto* self = static_cast<TizenVsyncWaiter*>(data);
7070

7171
std::weak_ptr<TdmClient> tdm_client = self->tdm_client_;
7272
if (!tdm_client.lock()->IsValid()) {
@@ -166,7 +166,7 @@ void TdmClient::VblankCallback(tdm_client_vblank* vblank,
166166
unsigned int tv_sec,
167167
unsigned int tv_usec,
168168
void* user_data) {
169-
auto* self = reinterpret_cast<TdmClient*>(user_data);
169+
auto* self = static_cast<TdmClient*>(user_data);
170170
FT_ASSERT(self != nullptr);
171171

172172
std::lock_guard<std::mutex> lock(self->engine_mutex_);

0 commit comments

Comments
 (0)