diff --git a/frontend/OBSStudioAPI.cpp b/frontend/OBSStudioAPI.cpp index 23aafeda1..a4bcafba7 100644 --- a/frontend/OBSStudioAPI.cpp +++ b/frontend/OBSStudioAPI.cpp @@ -331,7 +331,7 @@ void OBSStudioAPI::obs_frontend_add_tools_menu_item(const char *name, obs_fronte void *OBSStudioAPI::obs_frontend_add_dock(void *dock) { - QDockWidget *d = reinterpret_cast(dock); + QDockWidget *d = static_cast(dock); QString name = d->objectName(); if (name.isEmpty() || main->IsDockObjectNameUsed(name)) { @@ -387,7 +387,7 @@ bool OBSStudioAPI::obs_frontend_add_custom_qdock(const char *id, void *dock) return false; } - QDockWidget *d = reinterpret_cast(dock); + QDockWidget *d = static_cast(dock); d->setObjectName(QT_UTF8(id)); main->AddCustomDockWidget(d); diff --git a/frontend/components/OBSAdvAudioCtrl.cpp b/frontend/components/OBSAdvAudioCtrl.cpp index f1c59e600..33a6385ae 100644 --- a/frontend/components/OBSAdvAudioCtrl.cpp +++ b/frontend/components/OBSAdvAudioCtrl.cpp @@ -257,62 +257,57 @@ void OBSAdvAudioCtrl::ShowAudioControl(QGridLayout *layout) void OBSAdvAudioCtrl::OBSSourceActivated(void *param, calldata_t *) { - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceActiveChanged", Q_ARG(bool, true)); + QMetaObject::invokeMethod(static_cast(param), "SourceActiveChanged", Q_ARG(bool, true)); } void OBSAdvAudioCtrl::OBSSourceDeactivated(void *param, calldata_t *) { - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceActiveChanged", - Q_ARG(bool, false)); + QMetaObject::invokeMethod(static_cast(param), "SourceActiveChanged", Q_ARG(bool, false)); } void OBSAdvAudioCtrl::OBSSourceFlagsChanged(void *param, calldata_t *calldata) { uint32_t flags = (uint32_t)calldata_int(calldata, "flags"); - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceFlagsChanged", - Q_ARG(uint32_t, flags)); + QMetaObject::invokeMethod(static_cast(param), "SourceFlagsChanged", Q_ARG(uint32_t, flags)); } void OBSAdvAudioCtrl::OBSSourceVolumeChanged(void *param, calldata_t *calldata) { float volume = (float)calldata_float(calldata, "volume"); - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceVolumeChanged", - Q_ARG(float, volume)); + QMetaObject::invokeMethod(static_cast(param), "SourceVolumeChanged", Q_ARG(float, volume)); } void OBSAdvAudioCtrl::OBSSourceSyncChanged(void *param, calldata_t *calldata) { int64_t offset = calldata_int(calldata, "offset"); - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceSyncChanged", - Q_ARG(int64_t, offset)); + QMetaObject::invokeMethod(static_cast(param), "SourceSyncChanged", Q_ARG(int64_t, offset)); } void OBSAdvAudioCtrl::OBSSourceMonitoringTypeChanged(void *param, calldata_t *calldata) { int type = calldata_int(calldata, "type"); - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceMonitoringTypeChanged", + QMetaObject::invokeMethod(static_cast(param), "SourceMonitoringTypeChanged", Q_ARG(int, type)); } void OBSAdvAudioCtrl::OBSSourceMixersChanged(void *param, calldata_t *calldata) { uint32_t mixers = (uint32_t)calldata_int(calldata, "mixers"); - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceMixersChanged", + QMetaObject::invokeMethod(static_cast(param), "SourceMixersChanged", Q_ARG(uint32_t, mixers)); } void OBSAdvAudioCtrl::OBSSourceBalanceChanged(void *param, calldata_t *calldata) { int balance = (float)calldata_float(calldata, "balance") * 100.0f; - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceBalanceChanged", - Q_ARG(int, balance)); + QMetaObject::invokeMethod(static_cast(param), "SourceBalanceChanged", Q_ARG(int, balance)); } void OBSAdvAudioCtrl::OBSSourceRenamed(void *param, calldata_t *calldata) { QString newName = QT_UTF8(calldata_string(calldata, "new_name")); - QMetaObject::invokeMethod(reinterpret_cast(param), "SetSourceName", Q_ARG(QString, newName)); + QMetaObject::invokeMethod(static_cast(param), "SetSourceName", Q_ARG(QString, newName)); } /* ------------------------------------------------------------------------- */ diff --git a/frontend/components/SourceTree.cpp b/frontend/components/SourceTree.cpp index c91b2e197..9ffb7da35 100644 --- a/frontend/components/SourceTree.cpp +++ b/frontend/components/SourceTree.cpp @@ -313,7 +313,7 @@ void SourceTree::dropEvent(QDropEvent *event) using insertCollapsed_t = decltype(insertCollapsed); auto preInsertCollapsed = [](obs_scene_t *, obs_sceneitem_t *item, void *param) { - (*reinterpret_cast(param))(item); + (*static_cast(param))(item); return true; }; @@ -373,7 +373,7 @@ void SourceTree::dropEvent(QDropEvent *event) using updateScene_t = decltype(updateScene); auto preUpdateScene = [](void *data, obs_scene_t *) { - (*reinterpret_cast(data))(); + (*static_cast(data))(); }; ignoreReorder = true; diff --git a/frontend/components/SourceTreeItem.cpp b/frontend/components/SourceTreeItem.cpp index 46c94e42f..a731dd359 100644 --- a/frontend/components/SourceTreeItem.cpp +++ b/frontend/components/SourceTreeItem.cpp @@ -172,7 +172,7 @@ void SourceTreeItem::ReconnectSignals() /* --------------------------------------------------------- */ auto removeItem = [](void *data, calldata_t *cd) { - SourceTreeItem *this_ = reinterpret_cast(data); + SourceTreeItem *this_ = static_cast(data); obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item"); obs_scene_t *curScene = (obs_scene_t *)calldata_ptr(cd, "scene"); @@ -186,7 +186,7 @@ void SourceTreeItem::ReconnectSignals() }; auto itemVisible = [](void *data, calldata_t *cd) { - SourceTreeItem *this_ = reinterpret_cast(data); + SourceTreeItem *this_ = static_cast(data); obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item"); bool visible = calldata_bool(cd, "visible"); @@ -195,7 +195,7 @@ void SourceTreeItem::ReconnectSignals() }; auto itemLocked = [](void *data, calldata_t *cd) { - SourceTreeItem *this_ = reinterpret_cast(data); + SourceTreeItem *this_ = static_cast(data); obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item"); bool locked = calldata_bool(cd, "locked"); @@ -204,7 +204,7 @@ void SourceTreeItem::ReconnectSignals() }; auto itemSelect = [](void *data, calldata_t *cd) { - SourceTreeItem *this_ = reinterpret_cast(data); + SourceTreeItem *this_ = static_cast(data); obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item"); if (curItem == this_->sceneitem) @@ -212,7 +212,7 @@ void SourceTreeItem::ReconnectSignals() }; auto itemDeselect = [](void *data, calldata_t *cd) { - SourceTreeItem *this_ = reinterpret_cast(data); + SourceTreeItem *this_ = static_cast(data); obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item"); if (curItem == this_->sceneitem) @@ -220,7 +220,7 @@ void SourceTreeItem::ReconnectSignals() }; auto reorderGroup = [](void *data, calldata_t *) { - SourceTreeItem *this_ = reinterpret_cast(data); + SourceTreeItem *this_ = static_cast(data); QMetaObject::invokeMethod(this_->tree, "ReorderItems"); }; @@ -245,7 +245,7 @@ void SourceTreeItem::ReconnectSignals() /* --------------------------------------------------------- */ auto removeSource = [](void *data, calldata_t *) { - SourceTreeItem *this_ = reinterpret_cast(data); + SourceTreeItem *this_ = static_cast(data); this_->DisconnectSignals(); this_->sceneitem = nullptr; QMetaObject::invokeMethod(this_->tree, "RefreshItems"); diff --git a/frontend/components/SourceTreeModel.cpp b/frontend/components/SourceTreeModel.cpp index b10c8ab21..fca69e9a1 100644 --- a/frontend/components/SourceTreeModel.cpp +++ b/frontend/components/SourceTreeModel.cpp @@ -14,7 +14,7 @@ static inline OBSScene GetCurrentScene() void SourceTreeModel::OBSFrontendEvent(enum obs_frontend_event event, void *ptr) { - SourceTreeModel *stm = reinterpret_cast(ptr); + SourceTreeModel *stm = static_cast(ptr); switch (event) { case OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED: @@ -43,7 +43,7 @@ void SourceTreeModel::Clear() static bool enumItem(obs_scene_t *, obs_sceneitem_t *item, void *ptr) { - QVector &items = *reinterpret_cast *>(ptr); + QVector &items = *static_cast *>(ptr); obs_source_t *src = obs_sceneitem_get_source(item); if (obs_source_removed(src)) { diff --git a/frontend/components/UIValidation.cpp b/frontend/components/UIValidation.cpp index 3597949d0..bb24004b4 100644 --- a/frontend/components/UIValidation.cpp +++ b/frontend/components/UIValidation.cpp @@ -16,7 +16,7 @@ static int CountVideoSources() uint32_t flags = obs_source_get_output_flags(source); if ((flags & OBS_SOURCE_VIDEO) != 0) - (*reinterpret_cast(param))++; + (*static_cast(param))++; return true; }; diff --git a/frontend/components/VisibilityItemWidget.cpp b/frontend/components/VisibilityItemWidget.cpp index 1283f6fbe..bc1fda2e3 100644 --- a/frontend/components/VisibilityItemWidget.cpp +++ b/frontend/components/VisibilityItemWidget.cpp @@ -33,7 +33,7 @@ VisibilityItemWidget::VisibilityItemWidget(obs_source_t *source_) void VisibilityItemWidget::OBSSourceEnabled(void *param, calldata_t *data) { - VisibilityItemWidget *window = reinterpret_cast(param); + VisibilityItemWidget *window = static_cast(param); bool enabled = calldata_bool(data, "enabled"); QMetaObject::invokeMethod(window, "SourceEnabled", Q_ARG(bool, enabled)); diff --git a/frontend/dialogs/OBSBasicAdvAudio.cpp b/frontend/dialogs/OBSBasicAdvAudio.cpp index 110e9ef3a..860be2030 100644 --- a/frontend/dialogs/OBSBasicAdvAudio.cpp +++ b/frontend/dialogs/OBSBasicAdvAudio.cpp @@ -43,7 +43,7 @@ OBSBasicAdvAudio::~OBSBasicAdvAudio() bool OBSBasicAdvAudio::EnumSources(void *param, obs_source_t *source) { - OBSBasicAdvAudio *dialog = reinterpret_cast(param); + OBSBasicAdvAudio *dialog = static_cast(param); uint32_t flags = obs_source_get_output_flags(source); if ((flags & OBS_SOURCE_AUDIO) != 0 && @@ -57,15 +57,14 @@ void OBSBasicAdvAudio::OBSSourceAdded(void *param, calldata_t *calldata) { OBSSource source((obs_source_t *)calldata_ptr(calldata, "source")); - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceAdded", Q_ARG(OBSSource, source)); + QMetaObject::invokeMethod(static_cast(param), "SourceAdded", Q_ARG(OBSSource, source)); } void OBSBasicAdvAudio::OBSSourceRemoved(void *param, calldata_t *calldata) { OBSSource source((obs_source_t *)calldata_ptr(calldata, "source")); - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceRemoved", - Q_ARG(OBSSource, source)); + QMetaObject::invokeMethod(static_cast(param), "SourceRemoved", Q_ARG(OBSSource, source)); } void OBSBasicAdvAudio::OBSSourceActivated(void *param, calldata_t *calldata) @@ -73,7 +72,7 @@ void OBSBasicAdvAudio::OBSSourceActivated(void *param, calldata_t *calldata) OBSSource source((obs_source_t *)calldata_ptr(calldata, "source")); if (obs_source_audio_active(source)) - QMetaObject::invokeMethod(reinterpret_cast(param), "SourceAdded", + QMetaObject::invokeMethod(static_cast(param), "SourceAdded", Q_ARG(OBSSource, source)); } diff --git a/frontend/dialogs/OBSBasicFilters.cpp b/frontend/dialogs/OBSBasicFilters.cpp index 664024883..a7c42d7f6 100644 --- a/frontend/dialogs/OBSBasicFilters.cpp +++ b/frontend/dialogs/OBSBasicFilters.cpp @@ -176,7 +176,7 @@ inline OBSSource OBSBasicFilters::GetFilter(int row, bool async) void FilterChangeUndoRedo(void *vp, obs_data_t *nd_old_settings, obs_data_t *new_settings) { - obs_source_t *source = reinterpret_cast(vp); + obs_source_t *source = static_cast(vp); const char *source_uuid = obs_source_get_uuid(source); const char *name = obs_source_get_name(source); OBSBasic *main = OBSBasic::Get(); @@ -252,7 +252,7 @@ void OBSBasicFilters::UpdatePropertiesView(int row, bool async) auto disabled_undo = [](void *vp, obs_data_t *settings) { OBSBasic *main = OBSBasic::Get(); main->undo_s.disable(); - obs_source_t *source = reinterpret_cast(vp); + obs_source_t *source = static_cast(vp); obs_source_update(source, settings); }; @@ -365,7 +365,7 @@ void OBSBasicFilters::ReorderFilters() obs_source_enum_filters( source, [](obs_source_t *, obs_source_t *filter, void *p) { - FilterOrderInfo *info = reinterpret_cast(p); + FilterOrderInfo *info = static_cast(p); uint32_t flags; bool async; @@ -392,7 +392,7 @@ void OBSBasicFilters::UpdateFilters() obs_source_enum_filters( source, [](obs_source_t *, obs_source_t *filter, void *p) { - OBSBasicFilters *window = reinterpret_cast(p); + OBSBasicFilters *window = static_cast(p); window->AddFilter(filter, false); }, @@ -620,7 +620,7 @@ bool OBSBasicFilters::nativeEvent(const QByteArray &, void *message, qintptr *) void OBSBasicFilters::OBSSourceFilterAdded(void *param, calldata_t *data) { - OBSBasicFilters *window = reinterpret_cast(param); + OBSBasicFilters *window = static_cast(param); obs_source_t *filter = (obs_source_t *)calldata_ptr(data, "filter"); QMetaObject::invokeMethod(window, "AddFilter", Q_ARG(OBSSource, OBSSource(filter))); @@ -628,7 +628,7 @@ void OBSBasicFilters::OBSSourceFilterAdded(void *param, calldata_t *data) void OBSBasicFilters::OBSSourceFilterRemoved(void *param, calldata_t *data) { - OBSBasicFilters *window = reinterpret_cast(param); + OBSBasicFilters *window = static_cast(param); obs_source_t *filter = (obs_source_t *)calldata_ptr(data, "filter"); QMetaObject::invokeMethod(window, "RemoveFilter", Q_ARG(OBSSource, OBSSource(filter))); @@ -636,7 +636,7 @@ void OBSBasicFilters::OBSSourceFilterRemoved(void *param, calldata_t *data) void OBSBasicFilters::OBSSourceReordered(void *param, calldata_t *) { - QMetaObject::invokeMethod(reinterpret_cast(param), "ReorderFilters"); + QMetaObject::invokeMethod(static_cast(param), "ReorderFilters"); } void OBSBasicFilters::SourceRemoved(void *param, calldata_t *) diff --git a/frontend/dialogs/OBSBasicSourceSelect.cpp b/frontend/dialogs/OBSBasicSourceSelect.cpp index 15ea83b4f..76db07802 100644 --- a/frontend/dialogs/OBSBasicSourceSelect.cpp +++ b/frontend/dialogs/OBSBasicSourceSelect.cpp @@ -256,7 +256,7 @@ void OBSBasicSourceSelect::on_buttonBox_accepted() obs_scene_t *scene = obs_get_scene_by_name(scene_name); OBSSceneItem item; auto cb = [](obs_scene_t *, obs_sceneitem_t *sceneitem, void *data) { - OBSSceneItem &last = *reinterpret_cast(data); + OBSSceneItem &last = *static_cast(data); last = sceneitem; return true; }; diff --git a/frontend/dialogs/OBSBasicTransform.cpp b/frontend/dialogs/OBSBasicTransform.cpp index 9d75e6a1d..add9c21b4 100644 --- a/frontend/dialogs/OBSBasicTransform.cpp +++ b/frontend/dialogs/OBSBasicTransform.cpp @@ -6,7 +6,7 @@ static bool find_sel(obs_scene_t *, obs_sceneitem_t *item, void *param) { - OBSSceneItem &dst = *reinterpret_cast(param); + OBSSceneItem &dst = *static_cast(param); if (obs_sceneitem_selected(item)) { dst = item; @@ -138,7 +138,7 @@ void OBSBasicTransform::SetItemQt(OBSSceneItem newItem) void OBSBasicTransform::OBSChannelChanged(void *param, calldata_t *data) { - OBSBasicTransform *window = reinterpret_cast(param); + OBSBasicTransform *window = static_cast(param); uint32_t channel = (uint32_t)calldata_int(data, "channel"); OBSSource source = (obs_source_t *)calldata_ptr(data, "source"); @@ -155,7 +155,7 @@ void OBSBasicTransform::OBSChannelChanged(void *param, calldata_t *data) void OBSBasicTransform::OBSSceneItemTransform(void *param, calldata_t *data) { - OBSBasicTransform *window = reinterpret_cast(param); + OBSBasicTransform *window = static_cast(param); OBSSceneItem item = (obs_sceneitem_t *)calldata_ptr(data, "item"); if (item == window->item && !window->ignoreTransformSignal) @@ -164,7 +164,7 @@ void OBSBasicTransform::OBSSceneItemTransform(void *param, calldata_t *data) void OBSBasicTransform::OBSSceneItemRemoved(void *param, calldata_t *data) { - OBSBasicTransform *window = reinterpret_cast(param); + OBSBasicTransform *window = static_cast(param); obs_scene_t *scene = (obs_scene_t *)calldata_ptr(data, "scene"); obs_sceneitem_t *item = (obs_sceneitem_t *)calldata_ptr(data, "item"); @@ -174,7 +174,7 @@ void OBSBasicTransform::OBSSceneItemRemoved(void *param, calldata_t *data) void OBSBasicTransform::OBSSceneItemSelect(void *param, calldata_t *data) { - OBSBasicTransform *window = reinterpret_cast(param); + OBSBasicTransform *window = static_cast(param); OBSSceneItem item = (obs_sceneitem_t *)calldata_ptr(data, "item"); if (item != window->item) @@ -183,7 +183,7 @@ void OBSBasicTransform::OBSSceneItemSelect(void *param, calldata_t *data) void OBSBasicTransform::OBSSceneItemDeselect(void *param, calldata_t *data) { - OBSBasicTransform *window = reinterpret_cast(param); + OBSBasicTransform *window = static_cast(param); obs_scene_t *scene = (obs_scene_t *)calldata_ptr(data, "scene"); obs_sceneitem_t *item = (obs_sceneitem_t *)calldata_ptr(data, "item"); @@ -195,7 +195,7 @@ void OBSBasicTransform::OBSSceneItemDeselect(void *param, calldata_t *data) void OBSBasicTransform::OBSSceneItemLocked(void *param, calldata_t *data) { - OBSBasicTransform *window = reinterpret_cast(param); + OBSBasicTransform *window = static_cast(param); bool locked = calldata_bool(data, "locked"); QMetaObject::invokeMethod(window, "SetEnabled", Q_ARG(bool, !locked)); diff --git a/frontend/utility/QuickTransition.cpp b/frontend/utility/QuickTransition.cpp index f0179a6cd..b4f3af0d7 100644 --- a/frontend/utility/QuickTransition.cpp +++ b/frontend/utility/QuickTransition.cpp @@ -37,7 +37,7 @@ static inline QString MakeQuickTransitionText(QuickTransition *qt) void QuickTransition::SourceRenamed(void *param, calldata_t *) { - QuickTransition *qt = reinterpret_cast(param); + QuickTransition *qt = static_cast(param); QString hotkeyName = QTStr("QuickTransitions.HotkeyName").arg(MakeQuickTransitionText(qt)); diff --git a/frontend/utility/ScreenshotObj.cpp b/frontend/utility/ScreenshotObj.cpp index 5b7bc86ca..0fff65d6f 100644 --- a/frontend/utility/ScreenshotObj.cpp +++ b/frontend/utility/ScreenshotObj.cpp @@ -286,7 +286,7 @@ void ScreenshotObj::MuxAndFinish() static void ScreenshotTick(void *param, float) { - ScreenshotObj *data = reinterpret_cast(param); + ScreenshotObj *data = static_cast(param); if (data->stage == STAGE_FINISH) { return; diff --git a/frontend/widgets/OBSBasicPreview.cpp b/frontend/widgets/OBSBasicPreview.cpp index f0c0a6f16..f26dd0ed8 100644 --- a/frontend/widgets/OBSBasicPreview.cpp +++ b/frontend/widgets/OBSBasicPreview.cpp @@ -113,7 +113,7 @@ static bool CloseFloat(float a, float b, float epsilon = 0.01) static bool FindItemAtPos(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - SceneFindData *data = reinterpret_cast(param); + SceneFindData *data = static_cast(param); matrix4 transform; matrix4 invTransform; vec3 transformedPos; @@ -230,7 +230,7 @@ OBSSceneItem OBSBasicPreview::GetItemAtPos(const vec2 &pos, bool selectBelow) static bool CheckItemSelected(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - SceneFindData *data = reinterpret_cast(param); + SceneFindData *data = static_cast(param); matrix4 transform; vec3 transformedPos; vec3 pos3; @@ -322,7 +322,7 @@ struct HandleFindData { static bool FindHandleAtPos(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - HandleFindData &data = *reinterpret_cast(param); + HandleFindData &data = *static_cast(param); if (!obs_sceneitem_selected(item)) { if (obs_sceneitem_is_group(item)) { @@ -673,7 +673,7 @@ void OBSBasicPreview::UpdateCursor(uint32_t &flags) static bool select_one(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - obs_sceneitem_t *selectedItem = reinterpret_cast(param); + obs_sceneitem_t *selectedItem = static_cast(param); if (obs_sceneitem_is_group(item)) obs_sceneitem_group_enum_items(item, select_one, param); @@ -805,7 +805,7 @@ struct SelectedItemBounds { static bool AddItemBounds(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - SelectedItemBounds *data = reinterpret_cast(param); + SelectedItemBounds *data = static_cast(param); vec3 t[4]; auto add_bounds = [data, &t]() { @@ -862,7 +862,7 @@ struct OffsetData { static bool GetSourceSnapOffset(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - OffsetData *data = reinterpret_cast(param); + OffsetData *data = static_cast(param); if (obs_sceneitem_selected(item)) return true; @@ -957,7 +957,7 @@ static bool move_items(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *p return true; bool selected = obs_sceneitem_selected(item); - vec2 *offset = reinterpret_cast(param); + vec2 *offset = static_cast(param); if (obs_sceneitem_is_group(item) && !selected) { matrix4 transform; @@ -1058,7 +1058,7 @@ static bool IntersectBox(matrix4 transform, float x1, float x2, float y1, float bool OBSBasicPreview::FindSelected(obs_scene_t *, obs_sceneitem_t *item, void *param) { - SceneFindBoxData *data = reinterpret_cast(param); + SceneFindBoxData *data = static_cast(param); if (obs_sceneitem_selected(item)) data->sceneItems.push_back(item); @@ -1068,7 +1068,7 @@ bool OBSBasicPreview::FindSelected(obs_scene_t *, obs_sceneitem_t *item, void *p static bool FindItemsInBox(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - SceneFindBoxData *data = reinterpret_cast(param); + SceneFindBoxData *data = static_cast(param); matrix4 transform; matrix4 invTransform; vec3 transformedPos; @@ -1788,7 +1788,7 @@ bool OBSBasicPreview::DrawSelectedOverflow(obs_scene_t *, obs_sceneitem_t *item, if (!SceneItemHasVideo(item)) return true; - OBSBasicPreview *prev = reinterpret_cast(param); + OBSBasicPreview *prev = static_cast(param); if (!prev->GetOverflowSelectionHidden() && !obs_sceneitem_visible(item)) return true; @@ -1868,7 +1868,7 @@ bool OBSBasicPreview::DrawSelectedItem(obs_scene_t *, obs_sceneitem_t *item, voi if (!SceneItemHasVideo(item)) return true; - OBSBasicPreview *prev = reinterpret_cast(param); + OBSBasicPreview *prev = static_cast(param); if (obs_sceneitem_is_group(item)) { matrix4 mat; diff --git a/frontend/widgets/OBSBasicStats.cpp b/frontend/widgets/OBSBasicStats.cpp index 9357d26da..18fe177b4 100644 --- a/frontend/widgets/OBSBasicStats.cpp +++ b/frontend/widgets/OBSBasicStats.cpp @@ -17,7 +17,7 @@ void OBSBasicStats::OBSFrontendEvent(enum obs_frontend_event event, void *ptr) { - OBSBasicStats *stats = reinterpret_cast(ptr); + OBSBasicStats *stats = static_cast(ptr); switch (event) { case OBS_FRONTEND_EVENT_RECORDING_STARTED: diff --git a/frontend/widgets/OBSBasicStatusBar.cpp b/frontend/widgets/OBSBasicStatusBar.cpp index e6d3fce66..1a202ed2d 100644 --- a/frontend/widgets/OBSBasicStatusBar.cpp +++ b/frontend/widgets/OBSBasicStatusBar.cpp @@ -365,7 +365,7 @@ void OBSBasicStatusBar::UpdateDroppedFrames() void OBSBasicStatusBar::OBSOutputReconnect(void *data, calldata_t *params) { - OBSBasicStatusBar *statusBar = reinterpret_cast(data); + OBSBasicStatusBar *statusBar = static_cast(data); int seconds = (int)calldata_int(params, "timeout_sec"); QMetaObject::invokeMethod(statusBar, "Reconnect", Q_ARG(int, seconds)); @@ -373,7 +373,7 @@ void OBSBasicStatusBar::OBSOutputReconnect(void *data, calldata_t *params) void OBSBasicStatusBar::OBSOutputReconnectSuccess(void *data, calldata_t *) { - OBSBasicStatusBar *statusBar = reinterpret_cast(data); + OBSBasicStatusBar *statusBar = static_cast(data); QMetaObject::invokeMethod(statusBar, "ReconnectSuccess"); } diff --git a/frontend/widgets/OBSBasic_Preview.cpp b/frontend/widgets/OBSBasic_Preview.cpp index 2da6aa21f..06d533beb 100644 --- a/frontend/widgets/OBSBasic_Preview.cpp +++ b/frontend/widgets/OBSBasic_Preview.cpp @@ -294,7 +294,7 @@ static bool nudge_callback(obs_scene_t *, obs_sceneitem_t *item, void *param) if (obs_sceneitem_locked(item)) return true; - struct vec2 &offset = *reinterpret_cast(param); + struct vec2 &offset = *static_cast(param); struct vec2 pos; if (!obs_sceneitem_selected(item)) { diff --git a/frontend/widgets/OBSBasic_SceneItems.cpp b/frontend/widgets/OBSBasic_SceneItems.cpp index 48919c0cd..ce60b71ec 100644 --- a/frontend/widgets/OBSBasic_SceneItems.cpp +++ b/frontend/widgets/OBSBasic_SceneItems.cpp @@ -880,7 +880,7 @@ void OBSBasic::on_actionAddSource_triggered() static bool remove_items(obs_scene_t *, obs_sceneitem_t *item, void *param) { - vector &items = *reinterpret_cast *>(param); + vector &items = *static_cast *>(param); if (obs_sceneitem_selected(item)) { items.emplace_back(item); @@ -1120,7 +1120,7 @@ static bool RotateSelectedSources(obs_scene_t * /* scene */, obs_sceneitem_t *it if (obs_sceneitem_locked(item)) return true; - float rot = *reinterpret_cast(param); + float rot = *static_cast(param); vec3 tl = GetItemTL(item); @@ -1182,7 +1182,7 @@ void OBSBasic::on_actionRotate180_triggered() static bool MultiplySelectedItemScale(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - vec2 &mul = *reinterpret_cast(param); + vec2 &mul = *static_cast(param); if (obs_sceneitem_is_group(item)) obs_sceneitem_group_enum_items(item, MultiplySelectedItemScale, param); @@ -1237,7 +1237,7 @@ void OBSBasic::on_actionFlipVertical_triggered() static bool CenterAlignSelectedItems(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - obs_bounds_type boundsType = *reinterpret_cast(param); + obs_bounds_type boundsType = *static_cast(param); if (obs_sceneitem_is_group(item)) obs_sceneitem_group_enum_items(item, CenterAlignSelectedItems, param); diff --git a/frontend/widgets/OBSBasic_Scenes.cpp b/frontend/widgets/OBSBasic_Scenes.cpp index 55be6b200..5ffe1c317 100644 --- a/frontend/widgets/OBSBasic_Scenes.cpp +++ b/frontend/widgets/OBSBasic_Scenes.cpp @@ -133,7 +133,7 @@ void OBSBasic::AddScene(OBSSource source) scene, [](obs_scene_t *, obs_sceneitem_t *item, void *param) { addSceneItem_t *func; - func = reinterpret_cast(param); + func = static_cast(param); (*func)(item); return true; }, @@ -187,7 +187,7 @@ void OBSBasic::RemoveScene(OBSSource source) static bool select_one(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { - obs_sceneitem_t *selectedItem = reinterpret_cast(param); + obs_sceneitem_t *selectedItem = static_cast(param); if (obs_sceneitem_is_group(item)) obs_sceneitem_group_enum_items(item, select_one, param); diff --git a/frontend/widgets/OBSBasic_VolControl.cpp b/frontend/widgets/OBSBasic_VolControl.cpp index 674d84829..120f8651d 100644 --- a/frontend/widgets/OBSBasic_VolControl.cpp +++ b/frontend/widgets/OBSBasic_VolControl.cpp @@ -99,7 +99,7 @@ void OBSBasic::UnhideAllAudioControls() auto PreEnum = [](void *data, obs_source_t *source) -> bool /* -- */ { - return (*reinterpret_cast(data))(source); + return (*static_cast(data))(source); }; obs_enum_sources(PreEnum, &UnhideAudioMixer); diff --git a/frontend/widgets/OBSProjector.cpp b/frontend/widgets/OBSProjector.cpp index f2982896f..2dee92d06 100644 --- a/frontend/widgets/OBSProjector.cpp +++ b/frontend/widgets/OBSProjector.cpp @@ -152,7 +152,7 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy) void OBSProjector::OBSRender(void *data, uint32_t cx, uint32_t cy) { - OBSProjector *window = reinterpret_cast(data); + OBSProjector *window = static_cast(data); if (!window->ready) return; @@ -206,7 +206,7 @@ void OBSProjector::OBSRender(void *data, uint32_t cx, uint32_t cy) void OBSProjector::OBSSourceRenamed(void *data, calldata_t *params) { - OBSProjector *window = reinterpret_cast(data); + OBSProjector *window = static_cast(data); QString oldName = calldata_string(params, "prev_name"); QString newName = calldata_string(params, "new_name"); @@ -215,7 +215,7 @@ void OBSProjector::OBSSourceRenamed(void *data, calldata_t *params) void OBSProjector::OBSSourceDestroyed(void *data, calldata_t *) { - OBSProjector *window = reinterpret_cast(data); + OBSProjector *window = static_cast(data); QMetaObject::invokeMethod(window, "EscapeTriggered"); } diff --git a/frontend/wizards/AutoConfigTestPage.cpp b/frontend/wizards/AutoConfigTestPage.cpp index e95cc7803..c6547ba1b 100644 --- a/frontend/wizards/AutoConfigTestPage.cpp +++ b/frontend/wizards/AutoConfigTestPage.cpp @@ -295,12 +295,12 @@ void AutoConfigTestPage::TestBandwidthThread() using on_stopped_t = decltype(on_stopped); auto pre_on_started = [](void *data, calldata_t *) { - on_started_t &on_started = *reinterpret_cast(data); + on_started_t &on_started = *static_cast(data); on_started(); }; auto pre_on_stopped = [](void *data, calldata_t *) { - on_stopped_t &on_stopped = *reinterpret_cast(data); + on_stopped_t &on_stopped = *static_cast(data); on_stopped(); }; @@ -529,7 +529,7 @@ bool AutoConfigTestPage::TestSoftwareEncoding() using on_stopped_t = decltype(on_stopped); auto pre_on_stopped = [](void *data, calldata_t *) { - on_stopped_t &on_stopped = *reinterpret_cast(data); + on_stopped_t &on_stopped = *static_cast(data); on_stopped(); };