Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

frontend: Use static_cast when casting from void pointers #11783

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

frontend: Use static_cast when casting from void pointers #11783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/OBSStudioAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,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<QDockWidget *>(dock);
QDockWidget *d = static_cast<QDockWidget *>(dock);

QString name = d->objectName();
if (name.isEmpty() || main->IsDockObjectNameUsed(name)) {
Expand Down Expand Up @@ -380,7 +380,7 @@ bool OBSStudioAPI::obs_frontend_add_custom_qdock(const char *id, void *dock)
return false;
}

QDockWidget *d = reinterpret_cast<QDockWidget *>(dock);
QDockWidget *d = static_cast<QDockWidget *>(dock);
d->setObjectName(QT_UTF8(id));

main->AddCustomDockWidget(d);
Expand Down
23 changes: 9 additions & 14 deletions frontend/components/OBSAdvAudioCtrl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,62 +257,57 @@ void OBSAdvAudioCtrl::ShowAudioControl(QGridLayout *layout)

void OBSAdvAudioCtrl::OBSSourceActivated(void *param, calldata_t *)
{
QMetaObject::invokeMethod(reinterpret_cast<OBSAdvAudioCtrl *>(param), "SourceActiveChanged", Q_ARG(bool, true));
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(param), "SourceActiveChanged", Q_ARG(bool, true));
}

void OBSAdvAudioCtrl::OBSSourceDeactivated(void *param, calldata_t *)
{
QMetaObject::invokeMethod(reinterpret_cast<OBSAdvAudioCtrl *>(param), "SourceActiveChanged",
Q_ARG(bool, false));
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(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<OBSAdvAudioCtrl *>(param), "SourceFlagsChanged",
Q_ARG(uint32_t, flags));
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(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<OBSAdvAudioCtrl *>(param), "SourceVolumeChanged",
Q_ARG(float, volume));
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(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<OBSAdvAudioCtrl *>(param), "SourceSyncChanged",
Q_ARG(int64_t, offset));
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(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<OBSAdvAudioCtrl *>(param), "SourceMonitoringTypeChanged",
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(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<OBSAdvAudioCtrl *>(param), "SourceMixersChanged",
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(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<OBSAdvAudioCtrl *>(param), "SourceBalanceChanged",
Q_ARG(int, balance));
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(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<OBSAdvAudioCtrl *>(param), "SetSourceName", Q_ARG(QString, newName));
QMetaObject::invokeMethod(static_cast<OBSAdvAudioCtrl *>(param), "SetSourceName", Q_ARG(QString, newName));
}

/* ------------------------------------------------------------------------- */
Expand Down
4 changes: 2 additions & 2 deletions frontend/components/SourceTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<insertCollapsed_t *>(param))(item);
(*static_cast<insertCollapsed_t *>(param))(item);
return true;
};

Expand Down Expand Up @@ -373,7 +373,7 @@ void SourceTree::dropEvent(QDropEvent *event)
using updateScene_t = decltype(updateScene);

auto preUpdateScene = [](void *data, obs_scene_t *) {
(*reinterpret_cast<updateScene_t *>(data))();
(*static_cast<updateScene_t *>(data))();
};

ignoreReorder = true;
Expand Down
14 changes: 7 additions & 7 deletions frontend/components/SourceTreeItem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ void SourceTreeItem::ReconnectSignals()
/* --------------------------------------------------------- */

auto removeItem = [](void *data, calldata_t *cd) {
SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem *>(data);
SourceTreeItem *this_ = static_cast<SourceTreeItem *>(data);
obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item");
obs_scene_t *curScene = (obs_scene_t *)calldata_ptr(cd, "scene");

Expand All @@ -190,7 +190,7 @@ void SourceTreeItem::ReconnectSignals()
};

auto itemVisible = [](void *data, calldata_t *cd) {
SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem *>(data);
SourceTreeItem *this_ = static_cast<SourceTreeItem *>(data);
obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item");
bool visible = calldata_bool(cd, "visible");

Expand All @@ -199,7 +199,7 @@ void SourceTreeItem::ReconnectSignals()
};

auto itemLocked = [](void *data, calldata_t *cd) {
SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem *>(data);
SourceTreeItem *this_ = static_cast<SourceTreeItem *>(data);
obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item");
bool locked = calldata_bool(cd, "locked");

Expand All @@ -208,23 +208,23 @@ void SourceTreeItem::ReconnectSignals()
};

auto itemSelect = [](void *data, calldata_t *cd) {
SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem *>(data);
SourceTreeItem *this_ = static_cast<SourceTreeItem *>(data);
obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item");

if (curItem == this_->sceneitem)
QMetaObject::invokeMethod(this_, "Select");
};

auto itemDeselect = [](void *data, calldata_t *cd) {
SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem *>(data);
SourceTreeItem *this_ = static_cast<SourceTreeItem *>(data);
obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item");

if (curItem == this_->sceneitem)
QMetaObject::invokeMethod(this_, "Deselect");
};

auto reorderGroup = [](void *data, calldata_t *) {
SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem *>(data);
SourceTreeItem *this_ = static_cast<SourceTreeItem *>(data);
QMetaObject::invokeMethod(this_->tree, "ReorderItems");
};

Expand All @@ -249,7 +249,7 @@ void SourceTreeItem::ReconnectSignals()
/* --------------------------------------------------------- */

auto removeSource = [](void *data, calldata_t *) {
SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem *>(data);
SourceTreeItem *this_ = static_cast<SourceTreeItem *>(data);
this_->DisconnectSignals();
this_->sceneitem = nullptr;
QMetaObject::invokeMethod(this_->tree, "RefreshItems");
Expand Down
4 changes: 2 additions & 2 deletions frontend/components/SourceTreeModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static inline OBSScene GetCurrentScene()

void SourceTreeModel::OBSFrontendEvent(enum obs_frontend_event event, void *ptr)
{
SourceTreeModel *stm = reinterpret_cast<SourceTreeModel *>(ptr);
SourceTreeModel *stm = static_cast<SourceTreeModel *>(ptr);

switch (event) {
case OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED:
Expand Down Expand Up @@ -43,7 +43,7 @@ void SourceTreeModel::Clear()

static bool enumItem(obs_scene_t *, obs_sceneitem_t *item, void *ptr)
{
QVector<OBSSceneItem> &items = *reinterpret_cast<QVector<OBSSceneItem> *>(ptr);
QVector<OBSSceneItem> &items = *static_cast<QVector<OBSSceneItem> *>(ptr);

obs_source_t *src = obs_sceneitem_get_source(item);
if (obs_source_removed(src)) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/UIValidation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ static int CountVideoSources()

uint32_t flags = obs_source_get_output_flags(source);
if ((flags & OBS_SOURCE_VIDEO) != 0)
(*reinterpret_cast<int *>(param))++;
(*static_cast<int *>(param))++;

return true;
};
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/VisibilityItemWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ VisibilityItemWidget::VisibilityItemWidget(obs_source_t *source_)

void VisibilityItemWidget::OBSSourceEnabled(void *param, calldata_t *data)
{
VisibilityItemWidget *window = reinterpret_cast<VisibilityItemWidget *>(param);
VisibilityItemWidget *window = static_cast<VisibilityItemWidget *>(param);
bool enabled = calldata_bool(data, "enabled");

QMetaObject::invokeMethod(window, "SourceEnabled", Q_ARG(bool, enabled));
Expand Down
9 changes: 4 additions & 5 deletions frontend/dialogs/OBSBasicAdvAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ OBSBasicAdvAudio::~OBSBasicAdvAudio()

bool OBSBasicAdvAudio::EnumSources(void *param, obs_source_t *source)
{
OBSBasicAdvAudio *dialog = reinterpret_cast<OBSBasicAdvAudio *>(param);
OBSBasicAdvAudio *dialog = static_cast<OBSBasicAdvAudio *>(param);
uint32_t flags = obs_source_get_output_flags(source);

if ((flags & OBS_SOURCE_AUDIO) != 0 &&
Expand All @@ -57,23 +57,22 @@ void OBSBasicAdvAudio::OBSSourceAdded(void *param, calldata_t *calldata)
{
OBSSource source((obs_source_t *)calldata_ptr(calldata, "source"));

QMetaObject::invokeMethod(reinterpret_cast<OBSBasicAdvAudio *>(param), "SourceAdded", Q_ARG(OBSSource, source));
QMetaObject::invokeMethod(static_cast<OBSBasicAdvAudio *>(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<OBSBasicAdvAudio *>(param), "SourceRemoved",
Q_ARG(OBSSource, source));
QMetaObject::invokeMethod(static_cast<OBSBasicAdvAudio *>(param), "SourceRemoved", Q_ARG(OBSSource, source));
}

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<OBSBasicAdvAudio *>(param), "SourceAdded",
QMetaObject::invokeMethod(static_cast<OBSBasicAdvAudio *>(param), "SourceAdded",
Q_ARG(OBSSource, source));
}

Expand Down
14 changes: 7 additions & 7 deletions frontend/dialogs/OBSBasicFilters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,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<obs_source_t *>(vp);
obs_source_t *source = static_cast<obs_source_t *>(vp);
const char *source_uuid = obs_source_get_uuid(source);
const char *name = obs_source_get_name(source);
OBSBasic *main = OBSBasic::Get();
Expand Down Expand Up @@ -250,7 +250,7 @@ void OBSBasicFilters::UpdatePropertiesView(int row, bool async)
auto disabled_undo = [](void *vp, obs_data_t *settings) {
OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
main->undo_s.disable();
obs_source_t *source = reinterpret_cast<obs_source_t *>(vp);
obs_source_t *source = static_cast<obs_source_t *>(vp);
obs_source_update(source, settings);
};

Expand Down Expand Up @@ -363,7 +363,7 @@ void OBSBasicFilters::ReorderFilters()
obs_source_enum_filters(
source,
[](obs_source_t *, obs_source_t *filter, void *p) {
FilterOrderInfo *info = reinterpret_cast<FilterOrderInfo *>(p);
FilterOrderInfo *info = static_cast<FilterOrderInfo *>(p);
uint32_t flags;
bool async;

Expand All @@ -390,7 +390,7 @@ void OBSBasicFilters::UpdateFilters()
obs_source_enum_filters(
source,
[](obs_source_t *, obs_source_t *filter, void *p) {
OBSBasicFilters *window = reinterpret_cast<OBSBasicFilters *>(p);
OBSBasicFilters *window = static_cast<OBSBasicFilters *>(p);

window->AddFilter(filter, false);
},
Expand Down Expand Up @@ -619,23 +619,23 @@ bool OBSBasicFilters::nativeEvent(const QByteArray &, void *message, qintptr *)

void OBSBasicFilters::OBSSourceFilterAdded(void *param, calldata_t *data)
{
OBSBasicFilters *window = reinterpret_cast<OBSBasicFilters *>(param);
OBSBasicFilters *window = static_cast<OBSBasicFilters *>(param);
obs_source_t *filter = (obs_source_t *)calldata_ptr(data, "filter");

QMetaObject::invokeMethod(window, "AddFilter", Q_ARG(OBSSource, OBSSource(filter)));
}

void OBSBasicFilters::OBSSourceFilterRemoved(void *param, calldata_t *data)
{
OBSBasicFilters *window = reinterpret_cast<OBSBasicFilters *>(param);
OBSBasicFilters *window = static_cast<OBSBasicFilters *>(param);
obs_source_t *filter = (obs_source_t *)calldata_ptr(data, "filter");

QMetaObject::invokeMethod(window, "RemoveFilter", Q_ARG(OBSSource, OBSSource(filter)));
}

void OBSBasicFilters::OBSSourceReordered(void *param, calldata_t *)
{
QMetaObject::invokeMethod(reinterpret_cast<OBSBasicFilters *>(param), "ReorderFilters");
QMetaObject::invokeMethod(static_cast<OBSBasicFilters *>(param), "ReorderFilters");
}

void OBSBasicFilters::SourceRemoved(void *param, calldata_t *)
Expand Down
2 changes: 1 addition & 1 deletion frontend/dialogs/OBSBasicSourceSelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<OBSSceneItem *>(data);
OBSSceneItem &last = *static_cast<OBSSceneItem *>(data);
last = sceneitem;
return true;
};
Expand Down
14 changes: 7 additions & 7 deletions frontend/dialogs/OBSBasicTransform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

static bool find_sel(obs_scene_t *, obs_sceneitem_t *item, void *param)
{
OBSSceneItem &dst = *reinterpret_cast<OBSSceneItem *>(param);
OBSSceneItem &dst = *static_cast<OBSSceneItem *>(param);

if (obs_sceneitem_selected(item)) {
dst = item;
Expand Down Expand Up @@ -138,7 +138,7 @@ void OBSBasicTransform::SetItemQt(OBSSceneItem newItem)

void OBSBasicTransform::OBSChannelChanged(void *param, calldata_t *data)
{
OBSBasicTransform *window = reinterpret_cast<OBSBasicTransform *>(param);
OBSBasicTransform *window = static_cast<OBSBasicTransform *>(param);
uint32_t channel = (uint32_t)calldata_int(data, "channel");
OBSSource source = (obs_source_t *)calldata_ptr(data, "source");

Expand All @@ -155,7 +155,7 @@ void OBSBasicTransform::OBSChannelChanged(void *param, calldata_t *data)

void OBSBasicTransform::OBSSceneItemTransform(void *param, calldata_t *data)
{
OBSBasicTransform *window = reinterpret_cast<OBSBasicTransform *>(param);
OBSBasicTransform *window = static_cast<OBSBasicTransform *>(param);
OBSSceneItem item = (obs_sceneitem_t *)calldata_ptr(data, "item");

if (item == window->item && !window->ignoreTransformSignal)
Expand All @@ -164,7 +164,7 @@ void OBSBasicTransform::OBSSceneItemTransform(void *param, calldata_t *data)

void OBSBasicTransform::OBSSceneItemRemoved(void *param, calldata_t *data)
{
OBSBasicTransform *window = reinterpret_cast<OBSBasicTransform *>(param);
OBSBasicTransform *window = static_cast<OBSBasicTransform *>(param);
obs_scene_t *scene = (obs_scene_t *)calldata_ptr(data, "scene");
obs_sceneitem_t *item = (obs_sceneitem_t *)calldata_ptr(data, "item");

Expand All @@ -174,7 +174,7 @@ void OBSBasicTransform::OBSSceneItemRemoved(void *param, calldata_t *data)

void OBSBasicTransform::OBSSceneItemSelect(void *param, calldata_t *data)
{
OBSBasicTransform *window = reinterpret_cast<OBSBasicTransform *>(param);
OBSBasicTransform *window = static_cast<OBSBasicTransform *>(param);
OBSSceneItem item = (obs_sceneitem_t *)calldata_ptr(data, "item");

if (item != window->item)
Expand All @@ -183,7 +183,7 @@ void OBSBasicTransform::OBSSceneItemSelect(void *param, calldata_t *data)

void OBSBasicTransform::OBSSceneItemDeselect(void *param, calldata_t *data)
{
OBSBasicTransform *window = reinterpret_cast<OBSBasicTransform *>(param);
OBSBasicTransform *window = static_cast<OBSBasicTransform *>(param);
obs_scene_t *scene = (obs_scene_t *)calldata_ptr(data, "scene");
obs_sceneitem_t *item = (obs_sceneitem_t *)calldata_ptr(data, "item");

Expand All @@ -195,7 +195,7 @@ void OBSBasicTransform::OBSSceneItemDeselect(void *param, calldata_t *data)

void OBSBasicTransform::OBSSceneItemLocked(void *param, calldata_t *data)
{
OBSBasicTransform *window = reinterpret_cast<OBSBasicTransform *>(param);
OBSBasicTransform *window = static_cast<OBSBasicTransform *>(param);
bool locked = calldata_bool(data, "locked");

QMetaObject::invokeMethod(window, "SetEnabled", Q_ARG(bool, !locked));
Expand Down
2 changes: 1 addition & 1 deletion frontend/utility/QuickTransition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static inline QString MakeQuickTransitionText(QuickTransition *qt)

void QuickTransition::SourceRenamed(void *param, calldata_t *)
{
QuickTransition *qt = reinterpret_cast<QuickTransition *>(param);
QuickTransition *qt = static_cast<QuickTransition *>(param);

QString hotkeyName = QTStr("QuickTransitions.HotkeyName").arg(MakeQuickTransitionText(qt));

Expand Down
2 changes: 1 addition & 1 deletion frontend/utility/ScreenshotObj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void ScreenshotObj::MuxAndFinish()

static void ScreenshotTick(void *param, float)
{
ScreenshotObj *data = reinterpret_cast<ScreenshotObj *>(param);
ScreenshotObj *data = static_cast<ScreenshotObj *>(param);

if (data->stage == STAGE_FINISH) {
return;
Expand Down
Loading
Loading