diff --git a/UI/adv-audio-control.cpp b/UI/adv-audio-control.cpp index 45523db10..6f646cbb4 100644 --- a/UI/adv-audio-control.cpp +++ b/UI/adv-audio-control.cpp @@ -291,18 +291,16 @@ void OBSAdvAudioCtrl::ShowAudioControl(QGridLayout *layout) /* ------------------------------------------------------------------------- */ /* OBS source callbacks */ -void OBSAdvAudioCtrl::OBSSourceActivated(void *param, calldata_t *calldata) +void OBSAdvAudioCtrl::OBSSourceActivated(void *param, calldata_t *) { QMetaObject::invokeMethod(reinterpret_cast(param), "SourceActiveChanged", Q_ARG(bool, true)); - UNUSED_PARAMETER(calldata); } -void OBSAdvAudioCtrl::OBSSourceDeactivated(void *param, calldata_t *calldata) +void OBSAdvAudioCtrl::OBSSourceDeactivated(void *param, calldata_t *) { QMetaObject::invokeMethod(reinterpret_cast(param), "SourceActiveChanged", Q_ARG(bool, false)); - UNUSED_PARAMETER(calldata); } void OBSAdvAudioCtrl::OBSSourceFlagsChanged(void *param, calldata_t *calldata) diff --git a/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp b/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp index 91c8c7b4c..2d8a23253 100644 --- a/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp +++ b/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp @@ -292,12 +292,9 @@ static void toggle_multi_view(CNTV2Card *card, NTV2InputSource src, bool enable) } } -bool on_multi_view_toggle(void *data, obs_properties_t *props, - obs_property_t *list, obs_data_t *settings) +bool on_multi_view_toggle(void *data, obs_properties_t *, obs_property_t *, + obs_data_t *settings) { - UNUSED_PARAMETER(props); - UNUSED_PARAMETER(list); - bool multiViewEnabled = obs_data_get_bool(settings, kUIPropMultiViewEnable.id) && !main_output_running && !preview_output_running; @@ -345,11 +342,8 @@ void on_preview_scene_changed(enum obs_frontend_event event, void *param) } } -void render_preview_source(void *param, uint32_t cx, uint32_t cy) +void render_preview_source(void *param, uint32_t, uint32_t) { - UNUSED_PARAMETER(cx); - UNUSED_PARAMETER(cy); - auto ctx = (struct preview_output *)param; if (!ctx->current_source) diff --git a/UI/frontend-plugins/decklink-captions/decklink-captions.cpp b/UI/frontend-plugins/decklink-captions/decklink-captions.cpp index 53b37a826..c026fdbf1 100644 --- a/UI/frontend-plugins/decklink-captions/decklink-captions.cpp +++ b/UI/frontend-plugins/decklink-captions/decklink-captions.cpp @@ -67,11 +67,9 @@ void DecklinkCaptionsUI::on_source_currentIndexChanged(int) captions->start(); } -static void caption_callback(void *param, obs_source_t *source, +static void caption_callback(void * /* param */, obs_source_t * /* source */, const struct obs_source_cea_708 *captions) { - UNUSED_PARAMETER(param); - UNUSED_PARAMETER(source); obs_output *output = obs_frontend_get_streaming_output(); if (output) { if (obs_frontend_streaming_active() && diff --git a/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp b/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp index 29819de17..3c73a39e2 100644 --- a/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp +++ b/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp @@ -171,10 +171,8 @@ OBSData load_preview_settings() void on_preview_scene_changed(enum obs_frontend_event event, void *param); -static void decklink_ui_tick(void *param, float sec) +static void decklink_ui_tick(void *param, float /* sec */) { - UNUSED_PARAMETER(sec); - auto ctx = (struct decklink_ui_output *)param; if (ctx->texrender_premultiplied) diff --git a/UI/frontend-plugins/frontend-tools/captions-mssapi-stream.cpp b/UI/frontend-plugins/frontend-tools/captions-mssapi-stream.cpp index 74cf550a0..72eb407fb 100644 --- a/UI/frontend-plugins/frontend-tools/captions-mssapi-stream.cpp +++ b/UI/frontend-plugins/frontend-tools/captions-mssapi-stream.cpp @@ -138,7 +138,6 @@ STDMETHODIMP CaptionStream::Read(void *data, ULONG bytes, ULONG *read_bytes) STDMETHODIMP CaptionStream::Write(const void *, ULONG bytes, ULONG *) { debugfunc("data, %lu, written_bytes", bytes); - UNUSED_PARAMETER(bytes); return STG_E_INVALIDFUNCTION; } @@ -149,8 +148,6 @@ STDMETHODIMP CaptionStream::Seek(LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER *new_pos) { debugfunc("%lld, %lx, new_pos", move, origin); - UNUSED_PARAMETER(move); - UNUSED_PARAMETER(origin); if (!new_pos) return E_POINTER; @@ -165,7 +162,6 @@ STDMETHODIMP CaptionStream::Seek(LARGE_INTEGER move, DWORD origin, STDMETHODIMP CaptionStream::SetSize(ULARGE_INTEGER new_size) { debugfunc("%llu", new_size); - UNUSED_PARAMETER(new_size); return STG_E_INVALIDFUNCTION; } @@ -201,7 +197,6 @@ STDMETHODIMP CaptionStream::CopyTo(IStream *stream, ULARGE_INTEGER bytes, STDMETHODIMP CaptionStream::Commit(DWORD commit_flags) { debugfunc("%lx", commit_flags); - UNUSED_PARAMETER(commit_flags); /* TODO? */ return S_OK; } @@ -216,9 +211,6 @@ STDMETHODIMP CaptionStream::LockRegion(ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD type) { debugfunc("%llu, %llu, %ld", offset, size, type); - UNUSED_PARAMETER(offset); - UNUSED_PARAMETER(size); - UNUSED_PARAMETER(type); /* TODO? */ return STG_E_INVALIDFUNCTION; } @@ -227,9 +219,6 @@ STDMETHODIMP CaptionStream::UnlockRegion(ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD type) { debugfunc("%llu, %llu, %ld", offset, size, type); - UNUSED_PARAMETER(offset); - UNUSED_PARAMETER(size); - UNUSED_PARAMETER(type); /* TODO? */ return STG_E_INVALIDFUNCTION; } diff --git a/UI/importers/importers.hpp b/UI/importers/importers.hpp index 6cc57432d..b129cba12 100644 --- a/UI/importers/importers.hpp +++ b/UI/importers/importers.hpp @@ -87,11 +87,7 @@ public: int ImportScenes(const std::string &path, std::string &name, json11::Json &res); bool Check(const std::string &path); - std::string Name(const std::string &path) - { - return "XSplit Import"; - UNUSED_PARAMETER(path); - }; + std::string Name(const std::string &) { return "XSplit Import"; }; OBSImporterFiles FindFiles(); }; diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp index 6148e2bde..d9ef28eac 100644 --- a/UI/obs-app.cpp +++ b/UI/obs-app.cpp @@ -1873,8 +1873,8 @@ skip: return QApplication::notify(receiver, e); } -QString OBSTranslator::translate(const char *context, const char *sourceText, - const char *disambiguation, int n) const +QString OBSTranslator::translate(const char *, const char *sourceText, + const char *, int) const { const char *out = nullptr; QString str(sourceText); @@ -1882,9 +1882,6 @@ QString OBSTranslator::translate(const char *context, const char *sourceText, if (!App()->TranslateString(QT_TO_UTF8(str), &out)) return QString(sourceText); - UNUSED_PARAMETER(context); - UNUSED_PARAMETER(disambiguation); - UNUSED_PARAMETER(n); return QT_UTF8(out); } @@ -2531,7 +2528,8 @@ static int run_program(fstream &logFile, int argc, char *argv[]) "Woops, OBS has crashed!\n\nWould you like to copy the crash log " \ "to the clipboard? The crash log will still be saved to:\n\n%s" -static void main_crash_handler(const char *format, va_list args, void *param) +static void main_crash_handler(const char *format, va_list args, + void * /* param */) { char *text = new char[MAX_CRASH_REPORT_SIZE]; @@ -2597,8 +2595,6 @@ static void main_crash_handler(const char *format, va_list args, void *param) } exit(-1); - - UNUSED_PARAMETER(param); } static void load_debug_privilege(void) diff --git a/UI/properties-view.cpp b/UI/properties-view.cpp index 6b44b589f..3ada22adc 100644 --- a/UI/properties-view.cpp +++ b/UI/properties-view.cpp @@ -675,11 +675,8 @@ void OBSPropertiesView::AddEditableList(obs_property_t *prop, WidgetInfo *info = new WidgetInfo(this, prop, list); list->setDragDropMode(QAbstractItemView::InternalMove); - connect(list->model(), - SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)), - info, - SLOT(EditListReordered(const QModelIndex &, int, int, - const QModelIndex &, int))); + connect(list->model(), SIGNAL(rowsMoved()), info, + SLOT(EditListReordered())); QVBoxLayout *sideLayout = new QVBoxLayout(); NewButton(sideLayout, info, "addIconSmall", &WidgetInfo::EditListAdd); @@ -1917,16 +1914,8 @@ void WidgetInfo::GroupChanged(const char *setting) : true); } -void WidgetInfo::EditListReordered(const QModelIndex &parent, int start, - int end, const QModelIndex &destination, - int row) +void WidgetInfo::EditListReordered() { - UNUSED_PARAMETER(parent); - UNUSED_PARAMETER(start); - UNUSED_PARAMETER(end); - UNUSED_PARAMETER(destination); - UNUSED_PARAMETER(row); - EditableListChanged(); } diff --git a/UI/properties-view.hpp b/UI/properties-view.hpp index ce61899cf..74285d711 100644 --- a/UI/properties-view.hpp +++ b/UI/properties-view.hpp @@ -77,8 +77,7 @@ public slots: void EditListEdit(); void EditListUp(); void EditListDown(); - void EditListReordered(const QModelIndex &parent, int start, int end, - const QModelIndex &destination, int row); + void EditListReordered(); }; /* ------------------------------------------------------------------------- */ diff --git a/UI/window-basic-filters.cpp b/UI/window-basic-filters.cpp index 97a804c7d..5a9c023df 100644 --- a/UI/window-basic-filters.cpp +++ b/UI/window-basic-filters.cpp @@ -88,18 +88,12 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_) installEventFilter(CreateShortcutFilter()); connect(ui->asyncFilters->itemDelegate(), - SIGNAL(closeEditor(QWidget *, - QAbstractItemDelegate::EndEditHint)), - this, - SLOT(AsyncFilterNameEdited( - QWidget *, QAbstractItemDelegate::EndEditHint))); + SIGNAL(closeEditor(QWidget *)), this, + SLOT(AsyncFilterNameEdited(QWidget *))); connect(ui->effectFilters->itemDelegate(), - SIGNAL(closeEditor(QWidget *, - QAbstractItemDelegate::EndEditHint)), - this, - SLOT(EffectFilterNameEdited( - QWidget *, QAbstractItemDelegate::EndEditHint))); + SIGNAL(closeEditor(QWidget *)), this, + SLOT(EffectFilterNameEdited(QWidget *))); QPushButton *close = ui->buttonBox->button(QDialogButtonBox::Close); connect(close, SIGNAL(clicked()), this, SLOT(close())); @@ -754,18 +748,14 @@ void OBSBasicFilters::OBSSourceFilterRemoved(void *param, calldata_t *data) Q_ARG(OBSSource, OBSSource(filter))); } -void OBSBasicFilters::OBSSourceReordered(void *param, calldata_t *data) +void OBSBasicFilters::OBSSourceReordered(void *param, calldata_t *) { QMetaObject::invokeMethod(reinterpret_cast(param), "ReorderFilters"); - - UNUSED_PARAMETER(data); } -void OBSBasicFilters::SourceRemoved(void *param, calldata_t *data) +void OBSBasicFilters::SourceRemoved(void *param, calldata_t *) { - UNUSED_PARAMETER(data); - QMetaObject::invokeMethod(static_cast(param), "close"); } @@ -1171,18 +1161,14 @@ void OBSBasicFilters::FilterNameEdited(QWidget *editor, QListWidget *list) editActive = false; } -void OBSBasicFilters::AsyncFilterNameEdited( - QWidget *editor, QAbstractItemDelegate::EndEditHint endHint) +void OBSBasicFilters::AsyncFilterNameEdited(QWidget *editor) { FilterNameEdited(editor, ui->asyncFilters); - UNUSED_PARAMETER(endHint); } -void OBSBasicFilters::EffectFilterNameEdited( - QWidget *editor, QAbstractItemDelegate::EndEditHint endHint) +void OBSBasicFilters::EffectFilterNameEdited(QWidget *editor) { FilterNameEdited(editor, ui->effectFilters); - UNUSED_PARAMETER(endHint); } static bool ConfirmReset(QWidget *parent) diff --git a/UI/window-basic-filters.hpp b/UI/window-basic-filters.hpp index bd3f6a4bc..2a14e7931 100644 --- a/UI/window-basic-filters.hpp +++ b/UI/window-basic-filters.hpp @@ -113,10 +113,8 @@ private slots: void on_actionMoveUp_triggered(); void on_actionMoveDown_triggered(); - void AsyncFilterNameEdited(QWidget *editor, - QAbstractItemDelegate::EndEditHint endHint); - void EffectFilterNameEdited(QWidget *editor, - QAbstractItemDelegate::EndEditHint endHint); + void AsyncFilterNameEdited(QWidget *editor); + void EffectFilterNameEdited(QWidget *editor); void CopyFilter(); void PasteFilter(); diff --git a/UI/window-basic-interaction.cpp b/UI/window-basic-interaction.cpp index 5c31c4633..8fb79f48a 100644 --- a/UI/window-basic-interaction.cpp +++ b/UI/window-basic-interaction.cpp @@ -83,9 +83,7 @@ OBSBasicInteraction::~OBSBasicInteraction() OBSEventFilter *OBSBasicInteraction::BuildEventFilter() { - return new OBSEventFilter([this](QObject *obj, QEvent *event) { - UNUSED_PARAMETER(obj); - + return new OBSEventFilter([this](QObject *, QEvent *event) { switch (event->type()) { case QEvent::MouseButtonPress: case QEvent::MouseButtonRelease: @@ -115,12 +113,10 @@ OBSEventFilter *OBSBasicInteraction::BuildEventFilter() }); } -void OBSBasicInteraction::SourceRemoved(void *data, calldata_t *params) +void OBSBasicInteraction::SourceRemoved(void *data, calldata_t *) { QMetaObject::invokeMethod(static_cast(data), "close"); - - UNUSED_PARAMETER(params); } void OBSBasicInteraction::SourceRenamed(void *data, calldata_t *params) diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp index 55e2f3727..06b1c8d84 100644 --- a/UI/window-basic-main-outputs.cpp +++ b/UI/window-basic-main-outputs.cpp @@ -47,14 +47,12 @@ static void OBSStreamStopping(void *data, calldata_t *params) Q_ARG(int, sec)); } -static void OBSStartStreaming(void *data, calldata_t *params) +static void OBSStartStreaming(void *data, calldata_t * /* params */) { BasicOutputHandler *output = static_cast(data); output->streamingActive = true; os_atomic_set_bool(&streaming_active, true); QMetaObject::invokeMethod(output->main, "StreamingStart"); - - UNUSED_PARAMETER(params); } static void OBSStopStreaming(void *data, calldata_t *params) @@ -73,15 +71,13 @@ static void OBSStopStreaming(void *data, calldata_t *params) Q_ARG(QString, arg_last_error)); } -static void OBSStartRecording(void *data, calldata_t *params) +static void OBSStartRecording(void *data, calldata_t * /* params */) { BasicOutputHandler *output = static_cast(data); output->recordingActive = true; os_atomic_set_bool(&recording_active, true); QMetaObject::invokeMethod(output->main, "RecordingStart"); - - UNUSED_PARAMETER(params); } static void OBSStopRecording(void *data, calldata_t *params) @@ -100,12 +96,10 @@ static void OBSStopRecording(void *data, calldata_t *params) Q_ARG(QString, arg_last_error)); } -static void OBSRecordStopping(void *data, calldata_t *params) +static void OBSRecordStopping(void *data, calldata_t * /* params */) { BasicOutputHandler *output = static_cast(data); QMetaObject::invokeMethod(output->main, "RecordStopping"); - - UNUSED_PARAMETER(params); } static void OBSRecordFileChanged(void *data, calldata_t *params) @@ -122,15 +116,13 @@ static void OBSRecordFileChanged(void *data, calldata_t *params) output->lastRecordingPath = next_file; } -static void OBSStartReplayBuffer(void *data, calldata_t *params) +static void OBSStartReplayBuffer(void *data, calldata_t * /* params */) { BasicOutputHandler *output = static_cast(data); output->replayBufferActive = true; os_atomic_set_bool(&replaybuf_active, true); QMetaObject::invokeMethod(output->main, "ReplayBufferStart"); - - UNUSED_PARAMETER(params); } static void OBSStopReplayBuffer(void *data, calldata_t *params) @@ -144,30 +136,26 @@ static void OBSStopReplayBuffer(void *data, calldata_t *params) Q_ARG(int, code)); } -static void OBSReplayBufferStopping(void *data, calldata_t *params) +static void OBSReplayBufferStopping(void *data, calldata_t * /* params */) { BasicOutputHandler *output = static_cast(data); QMetaObject::invokeMethod(output->main, "ReplayBufferStopping"); - - UNUSED_PARAMETER(params); } -static void OBSReplayBufferSaved(void *data, calldata_t *) +static void OBSReplayBufferSaved(void *data, calldata_t * /* params */) { BasicOutputHandler *output = static_cast(data); QMetaObject::invokeMethod(output->main, "ReplayBufferSaved", Qt::QueuedConnection); } -static void OBSStartVirtualCam(void *data, calldata_t *params) +static void OBSStartVirtualCam(void *data, calldata_t * /* params */) { BasicOutputHandler *output = static_cast(data); output->virtualCamActive = true; os_atomic_set_bool(&virtualcam_active, true); QMetaObject::invokeMethod(output->main, "OnVirtualCamStart"); - - UNUSED_PARAMETER(params); } static void OBSStopVirtualCam(void *data, calldata_t *params) diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp index 483635f39..9f2e1354e 100644 --- a/UI/window-basic-main-transitions.cpp +++ b/UI/window-basic-main-transitions.cpp @@ -109,7 +109,7 @@ void OBSBasic::AddQuickTransitionHotkey(QuickTransition *qt) (void *)(uintptr_t)qt->id); } -void QuickTransition::SourceRenamed(void *param, calldata_t *data) +void QuickTransition::SourceRenamed(void *param, calldata_t *) { QuickTransition *qt = reinterpret_cast(param); @@ -117,8 +117,6 @@ void QuickTransition::SourceRenamed(void *param, calldata_t *data) .arg(MakeQuickTransitionText(qt)); obs_hotkey_set_description(qt->hotkey, QT_TO_UTF8(hotkeyName)); - - UNUSED_PARAMETER(data); } void OBSBasic::TriggerQuickTransition(int id) @@ -630,13 +628,11 @@ void OBSBasic::on_transitionProps_clicked() menu.exec(QCursor::pos()); } -void OBSBasic::on_transitionDuration_valueChanged(int value) +void OBSBasic::on_transitionDuration_valueChanged() { if (api) { api->on_event(OBS_FRONTEND_EVENT_TRANSITION_DURATION_CHANGED); } - - UNUSED_PARAMETER(value); } QuickTransition *OBSBasic::GetQuickTransition(int id) @@ -1696,7 +1692,7 @@ void OBSBasic::SetPreviewProgramMode(bool enabled) UpdateTitleBar(); } -void OBSBasic::RenderProgram(void *data, uint32_t cx, uint32_t cy) +void OBSBasic::RenderProgram(void *data, uint32_t, uint32_t) { GS_DEBUG_MARKER_BEGIN(GS_DEBUG_COLOR_DEFAULT, "RenderProgram"); @@ -1727,9 +1723,6 @@ void OBSBasic::RenderProgram(void *data, uint32_t cx, uint32_t cy) gs_viewport_pop(); GS_DEBUG_MARKER_END(); - - UNUSED_PARAMETER(cx); - UNUSED_PARAMETER(cy); } void OBSBasic::ResizeProgram(uint32_t cx, uint32_t cy) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 384b42687..fe5d24c82 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -379,12 +379,8 @@ OBSBasic::OBSBasic(QWidget *parent) UpdateTitleBar(); - connect(ui->scenes->itemDelegate(), - SIGNAL(closeEditor(QWidget *, - QAbstractItemDelegate::EndEditHint)), - this, - SLOT(SceneNameEdited(QWidget *, - QAbstractItemDelegate::EndEditHint))); + connect(ui->scenes->itemDelegate(), SIGNAL(closeEditor(QWidget *)), + this, SLOT(SceneNameEdited(QWidget *))); cpuUsageInfo = os_cpu_usage_info_start(); cpuUsageTimer = new QTimer(this); @@ -509,9 +505,6 @@ OBSBasic::OBSBasic(QWidget *parent) statsDock->move(newPos); ui->previewDisabledWidget->setContextMenuPolicy(Qt::CustomContextMenu); - connect(ui->previewDisabledWidget, - SIGNAL(customContextMenuRequested(const QPoint &)), this, - SLOT(PreviewDisabledMenu(const QPoint &))); connect(ui->enablePreviewButton, SIGNAL(clicked()), this, SLOT(TogglePreview())); @@ -3126,7 +3119,8 @@ void OBSBasic::RemoveScene(OBSSource source) api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED); } -static bool select_one(obs_scene_t *scene, obs_sceneitem_t *item, void *param) +static bool select_one(obs_scene_t * /* scene */, obs_sceneitem_t *item, + void *param) { obs_sceneitem_t *selectedItem = reinterpret_cast(param); @@ -3135,7 +3129,6 @@ static bool select_one(obs_scene_t *scene, obs_sceneitem_t *item, void *param) obs_sceneitem_select(item, (selectedItem == item)); - UNUSED_PARAMETER(scene); return true; } @@ -3926,8 +3919,9 @@ void OBSBasic::CheckForUpdates(bool manualUpdate) &OBSBasic::MacBranchesFetched, Qt::QueuedConnection); updateCheckThread.reset(mut); updateCheckThread->start(); -#endif +#else UNUSED_PARAMETER(manualUpdate); +#endif } void OBSBasic::MacBranchesFetched(const QString &branch, bool manualUpdate) @@ -4029,11 +4023,9 @@ void OBSBasic::DuplicateSelectedScene() } } -static bool save_undo_source_enum(obs_scene_t *scene, obs_sceneitem_t *item, - void *p) +static bool save_undo_source_enum(obs_scene_t * /* scene */, + obs_sceneitem_t *item, void *p) { - UNUSED_PARAMETER(scene); - obs_source_t *source = obs_sceneitem_get_source(item); if (obs_obj_is_private(source) && !obs_source_removed(source)) return true; @@ -4061,8 +4053,7 @@ static bool save_undo_source_enum(obs_scene_t *scene, obs_sceneitem_t *item, static inline void RemoveSceneAndReleaseNested(obs_source_t *source) { obs_source_remove(source); - auto cb = [](void *unused, obs_source_t *source) { - UNUSED_PARAMETER(unused); + auto cb = [](void *, obs_source_t *source) { if (strcmp(obs_source_get_id(source), "scene") == 0) obs_scene_prune_sources(obs_scene_from_source(source)); return true; @@ -4176,9 +4167,8 @@ void OBSBasic::RemoveSelectedScene() /* Clear scene, but keep a reference to all sources in the scene to make sure they don't get destroyed */ std::vector existing_sources; - auto cb = [](obs_scene_t *scene, obs_sceneitem_t *item, + auto cb = [](obs_scene_t *, obs_sceneitem_t *item, void *data) { - UNUSED_PARAMETER(scene); std::vector *existing = (std::vector *)data; OBSSource source = @@ -4393,7 +4383,7 @@ void OBSBasic::DrawBackdrop(float cx, float cy) GS_DEBUG_MARKER_END(); } -void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy) +void OBSBasic::RenderMain(void *data, uint32_t, uint32_t) { GS_DEBUG_MARKER_BEGIN(GS_DEBUG_COLOR_DEFAULT, "RenderMain"); @@ -4469,9 +4459,6 @@ void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy) gs_viewport_pop(); GS_DEBUG_MARKER_END(); - - UNUSED_PARAMETER(cx); - UNUSED_PARAMETER(cy); } /* Main class functions */ @@ -4859,9 +4846,8 @@ void OBSBasic::ClearSceneData() copyFiltersSource = nullptr; copyFilter = nullptr; - auto cb = [](void *unused, obs_source_t *source) { + auto cb = [](void *, obs_source_t *source) { obs_source_remove(source); - UNUSED_PARAMETER(unused); return true; }; @@ -5217,7 +5203,7 @@ void OBSBasic::on_actionMixerToolbarMenu_triggered() } void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current, - QListWidgetItem *prev) + QListWidgetItem *) { OBSSource source; @@ -5239,8 +5225,6 @@ void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current, api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED); UpdateContextBar(); - - UNUSED_PARAMETER(prev); } void OBSBasic::EditSceneName() @@ -6546,8 +6530,7 @@ static void RenameListItem(OBSBasic *parent, QListWidget *listWidget, } } -void OBSBasic::SceneNameEdited(QWidget *editor, - QAbstractItemDelegate::EndEditHint endHint) +void OBSBasic::SceneNameEdited(QWidget *editor) { OBSScene scene = GetCurrentScene(); QLineEdit *edit = qobject_cast(editor); @@ -6563,8 +6546,6 @@ void OBSBasic::SceneNameEdited(QWidget *editor, if (api) api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED); - - UNUSED_PARAMETER(endHint); } void OBSBasic::OpenFilters(OBSSource source) @@ -8090,14 +8071,12 @@ QModelIndexList OBSBasic::GetAllSelectedSourceItems() return ui->sources->selectionModel()->selectedIndexes(); } -void OBSBasic::on_preview_customContextMenuRequested(const QPoint &pos) +void OBSBasic::on_preview_customContextMenuRequested() { CreateSourcePopupMenu(GetTopSelectedSourceItem(), true); - - UNUSED_PARAMETER(pos); } -void OBSBasic::ProgramViewContextMenuRequested(const QPoint &) +void OBSBasic::ProgramViewContextMenuRequested() { QMenu popup(this); QPointer studioProgramProjector; @@ -8120,7 +8099,7 @@ void OBSBasic::ProgramViewContextMenuRequested(const QPoint &) popup.exec(QCursor::pos()); } -void OBSBasic::PreviewDisabledMenu(const QPoint &pos) +void OBSBasic::on_previewDisabledWidget_customContextMenuRequested() { QMenu popup(this); delete previewProjectorMain; @@ -8141,8 +8120,6 @@ void OBSBasic::PreviewDisabledMenu(const QPoint &pos) popup.addMenu(previewProjectorMain); popup.addAction(previewWindow); popup.exec(QCursor::pos()); - - UNUSED_PARAMETER(pos); } void OBSBasic::on_actionAlwaysOnTop_triggered() @@ -8379,7 +8356,7 @@ void OBSBasic::on_actionPasteTransform_triggered() undo_redo, undo_redo, undo_data, redo_data); } -static bool reset_tr(obs_scene_t *scene, obs_sceneitem_t *item, void *param) +static bool reset_tr(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *) { if (obs_sceneitem_is_group(item)) obs_sceneitem_group_enum_items(item, reset_tr, nullptr); @@ -8405,8 +8382,6 @@ static bool reset_tr(obs_scene_t *scene, obs_sceneitem_t *item, void *param) obs_sceneitem_defer_update_end(item); - UNUSED_PARAMETER(scene); - UNUSED_PARAMETER(param); return true; } @@ -8471,8 +8446,8 @@ static void SetItemTL(obs_sceneitem_t *item, const vec3 &tl) obs_sceneitem_set_pos(item, &pos); } -static bool RotateSelectedSources(obs_scene_t *scene, obs_sceneitem_t *item, - void *param) +static bool RotateSelectedSources(obs_scene_t * /* scene */, + obs_sceneitem_t *item, void *param) { if (obs_sceneitem_is_group(item)) obs_sceneitem_group_enum_items(item, RotateSelectedSources, @@ -8497,7 +8472,6 @@ static bool RotateSelectedSources(obs_scene_t *scene, obs_sceneitem_t *item, SetItemTL(item, tl); - UNUSED_PARAMETER(scene); return true; }; @@ -8552,8 +8526,8 @@ void OBSBasic::on_actionRotate180_triggered() undo_redo, undo_redo, undo_data, redo_data); } -static bool MultiplySelectedItemScale(obs_scene_t *scene, obs_sceneitem_t *item, - void *param) +static bool MultiplySelectedItemScale(obs_scene_t * /* scene */, + obs_sceneitem_t *item, void *param) { vec2 &mul = *reinterpret_cast(param); @@ -8576,7 +8550,6 @@ static bool MultiplySelectedItemScale(obs_scene_t *scene, obs_sceneitem_t *item, SetItemTL(item, tl); - UNUSED_PARAMETER(scene); return true; } @@ -8618,8 +8591,8 @@ void OBSBasic::on_actionFlipVertical_triggered() undo_redo, undo_redo, undo_data, redo_data); } -static bool CenterAlignSelectedItems(obs_scene_t *scene, obs_sceneitem_t *item, - void *param) +static bool CenterAlignSelectedItems(obs_scene_t * /* scene */, + obs_sceneitem_t *item, void *param) { obs_bounds_type boundsType = *reinterpret_cast(param); @@ -8648,7 +8621,6 @@ static bool CenterAlignSelectedItems(obs_scene_t *scene, obs_sceneitem_t *item, obs_sceneitem_set_info(item, &itemInfo); - UNUSED_PARAMETER(scene); return true; } diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 16541aa74..cbce69832 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -1099,9 +1099,9 @@ private slots: void on_actionWebsite_triggered(); void on_actionDiscord_triggered(); - void on_preview_customContextMenuRequested(const QPoint &pos); - void ProgramViewContextMenuRequested(const QPoint &pos); - void PreviewDisabledMenu(const QPoint &pos); + void on_preview_customContextMenuRequested(); + void ProgramViewContextMenuRequested(); + void on_previewDisabledWidget_customContextMenuRequested(); void on_actionNewSceneCollection_triggered(); void on_actionDupSceneCollection_triggered(); @@ -1131,7 +1131,7 @@ private slots: void on_transitionAdd_clicked(); void on_transitionRemove_clicked(); void on_transitionProps_clicked(); - void on_transitionDuration_valueChanged(int value); + void on_transitionDuration_valueChanged(); void ShowTransitionProperties(); void HideTransitionProperties(); @@ -1167,8 +1167,7 @@ private slots: void EditSceneName(); void EditSceneItemName(); - void SceneNameEdited(QWidget *editor, - QAbstractItemDelegate::EndEditHint endHint); + void SceneNameEdited(QWidget *editor); void OpenSceneFilters(); void OpenFilters(OBSSource source = nullptr); diff --git a/UI/window-basic-preview.cpp b/UI/window-basic-preview.cpp index eb4b2116c..7a03f6314 100644 --- a/UI/window-basic-preview.cpp +++ b/UI/window-basic-preview.cpp @@ -111,7 +111,7 @@ static bool CloseFloat(float a, float b, float epsilon = 0.01) return abs(a - b) <= epsilon; } -static bool FindItemAtPos(obs_scene_t *scene, obs_sceneitem_t *item, +static bool FindItemAtPos(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { SceneFindData *data = reinterpret_cast(param); @@ -147,7 +147,6 @@ static bool FindItemAtPos(obs_scene_t *scene, obs_sceneitem_t *item, data->item = item; } - UNUSED_PARAMETER(scene); return true; } @@ -238,7 +237,7 @@ OBSSceneItem OBSBasicPreview::GetItemAtPos(const vec2 &pos, bool selectBelow) return data.item; } -static bool CheckItemSelected(obs_scene_t *scene, obs_sceneitem_t *item, +static bool CheckItemSelected(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { SceneFindData *data = reinterpret_cast(param); @@ -280,7 +279,6 @@ static bool CheckItemSelected(obs_scene_t *scene, obs_sceneitem_t *item, } } - UNUSED_PARAMETER(scene); return true; } @@ -335,7 +333,7 @@ struct HandleFindData { } }; -static bool FindHandleAtPos(obs_scene_t *scene, obs_sceneitem_t *item, +static bool FindHandleAtPos(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { HandleFindData &data = *reinterpret_cast(param); @@ -431,7 +429,6 @@ static bool FindHandleAtPos(obs_scene_t *scene, obs_sceneitem_t *item, } } - UNUSED_PARAMETER(scene); return true; } @@ -679,7 +676,8 @@ void OBSBasicPreview::UpdateCursor(uint32_t &flags) setCursor(Qt::OpenHandCursor); } -static bool select_one(obs_scene_t *scene, obs_sceneitem_t *item, void *param) +static bool select_one(obs_scene_t * /* scene */, obs_sceneitem_t *item, + void *param) { obs_sceneitem_t *selectedItem = reinterpret_cast(param); @@ -688,7 +686,6 @@ static bool select_one(obs_scene_t *scene, obs_sceneitem_t *item, void *param) obs_sceneitem_select(item, (selectedItem == item)); - UNUSED_PARAMETER(scene); return true; } @@ -824,7 +821,7 @@ struct SelectedItemBounds { vec3 tl, br; }; -static bool AddItemBounds(obs_scene_t *scene, obs_sceneitem_t *item, +static bool AddItemBounds(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { SelectedItemBounds *data = @@ -875,7 +872,6 @@ static bool AddItemBounds(obs_scene_t *scene, obs_sceneitem_t *item, t[3] = GetTransformedPos(1.0f, 1.0f, boxTransform); add_bounds(); - UNUSED_PARAMETER(scene); return true; } @@ -884,8 +880,8 @@ struct OffsetData { vec3 tl, br, offset; }; -static bool GetSourceSnapOffset(obs_scene_t *scene, obs_sceneitem_t *item, - void *param) +static bool GetSourceSnapOffset(obs_scene_t * /* scene */, + obs_sceneitem_t *item, void *param) { OffsetData *data = reinterpret_cast(param); @@ -933,7 +929,6 @@ static bool GetSourceSnapOffset(obs_scene_t *scene, obs_sceneitem_t *item, EDGE_SNAP(br, tl, y, x); #undef EDGE_SNAP - UNUSED_PARAMETER(scene); return true; } @@ -987,7 +982,8 @@ void OBSBasicPreview::SnapItemMovement(vec2 &offset) } } -static bool move_items(obs_scene_t *scene, obs_sceneitem_t *item, void *param) +static bool move_items(obs_scene_t * /* scene */, obs_sceneitem_t *item, + void *param) { if (obs_sceneitem_locked(item)) return true; @@ -1014,7 +1010,6 @@ static bool move_items(obs_scene_t *scene, obs_sceneitem_t *item, void *param) obs_sceneitem_set_pos(item, &pos); } - UNUSED_PARAMETER(scene); return true; } @@ -1104,7 +1099,7 @@ static bool IntersectBox(matrix4 transform, float x1, float x2, float y1, } #undef PI -bool OBSBasicPreview::FindSelected(obs_scene_t *scene, obs_sceneitem_t *item, +bool OBSBasicPreview::FindSelected(obs_scene_t *, obs_sceneitem_t *item, void *param) { SceneFindBoxData *data = reinterpret_cast(param); @@ -1112,11 +1107,10 @@ bool OBSBasicPreview::FindSelected(obs_scene_t *scene, obs_sceneitem_t *item, if (obs_sceneitem_selected(item)) data->sceneItems.push_back(item); - UNUSED_PARAMETER(scene); return true; } -static bool FindItemsInBox(obs_scene_t *scene, obs_sceneitem_t *item, +static bool FindItemsInBox(obs_scene_t * /* scene */, obs_sceneitem_t *item, void *param) { SceneFindBoxData *data = reinterpret_cast(param); @@ -1206,7 +1200,6 @@ static bool FindItemsInBox(obs_scene_t *scene, obs_sceneitem_t *item, return true; } - UNUSED_PARAMETER(scene); return true; } @@ -1868,8 +1861,8 @@ static inline bool crop_enabled(const obs_sceneitem_crop *crop) crop->bottom > 0; } -bool OBSBasicPreview::DrawSelectedOverflow(obs_scene_t *scene, - obs_sceneitem_t *item, void *param) +bool OBSBasicPreview::DrawSelectedOverflow(obs_scene_t *, obs_sceneitem_t *item, + void *param) { if (obs_sceneitem_locked(item)) return true; @@ -1948,12 +1941,11 @@ bool OBSBasicPreview::DrawSelectedOverflow(obs_scene_t *scene, GS_DEBUG_MARKER_END(); - UNUSED_PARAMETER(scene); return true; } -bool OBSBasicPreview::DrawSelectedItem(obs_scene_t *scene, - obs_sceneitem_t *item, void *param) +bool OBSBasicPreview::DrawSelectedItem(obs_scene_t *, obs_sceneitem_t *item, + void *param) { if (obs_sceneitem_locked(item)) return true; @@ -2130,7 +2122,6 @@ bool OBSBasicPreview::DrawSelectedItem(obs_scene_t *scene, GS_DEBUG_MARKER_END(); - UNUSED_PARAMETER(scene); return true; } diff --git a/UI/window-basic-properties.cpp b/UI/window-basic-properties.cpp index 145b2efc0..9f9c9bc4a 100644 --- a/UI/window-basic-properties.cpp +++ b/UI/window-basic-properties.cpp @@ -278,12 +278,10 @@ static void CreateTransitionScene(OBSSource scene, const char *text, obs_sceneitem_set_bounds_type(item, OBS_BOUNDS_SCALE_INNER); } -void OBSBasicProperties::SourceRemoved(void *data, calldata_t *params) +void OBSBasicProperties::SourceRemoved(void *data, calldata_t *) { QMetaObject::invokeMethod(static_cast(data), "close"); - - UNUSED_PARAMETER(params); } void OBSBasicProperties::SourceRenamed(void *data, calldata_t *params) diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 25cf7f4c1..717fe77f5 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -4351,7 +4351,7 @@ void OBSBasicSettings::on_advOutFFPathBrowse_clicked() ui->advOutFFRecPath->setText(dir); } -void OBSBasicSettings::on_advOutEncoder_currentIndexChanged(int idx) +void OBSBasicSettings::on_advOutEncoder_currentIndexChanged() { QString encoder = GetComboData(ui->advOutEncoder); if (!loading) { @@ -4368,8 +4368,6 @@ void OBSBasicSettings::on_advOutEncoder_currentIndexChanged(int idx) ui->advOutUseRescale->setVisible(true); ui->advOutRescale->setVisible(true); - - UNUSED_PARAMETER(idx); } void OBSBasicSettings::on_advOutRecEncoder_currentIndexChanged(int idx) diff --git a/UI/window-basic-settings.hpp b/UI/window-basic-settings.hpp index c2536a062..6c91532ae 100644 --- a/UI/window-basic-settings.hpp +++ b/UI/window-basic-settings.hpp @@ -393,7 +393,7 @@ private slots: void on_simpleOutputBrowse_clicked(); void on_advOutRecPathBrowse_clicked(); void on_advOutFFPathBrowse_clicked(); - void on_advOutEncoder_currentIndexChanged(int idx); + void on_advOutEncoder_currentIndexChanged(); void on_advOutRecEncoder_currentIndexChanged(int idx); void on_advOutFFIgnoreCompat_stateChanged(int state); void on_advOutFFFormat_currentIndexChanged(int idx); diff --git a/UI/window-basic-source-select.cpp b/UI/window-basic-source-select.cpp index a6c794168..38308b5be 100644 --- a/UI/window-basic-source-select.cpp +++ b/UI/window-basic-source-select.cpp @@ -263,8 +263,7 @@ void OBSBasicSourceSelect::on_buttonBox_accepted() const char *scene_name = obs_source_get_name(main->GetCurrentSceneSource()); - auto undo = [scene_name, main](const std::string &data) { - UNUSED_PARAMETER(data); + auto undo = [scene_name, main](const std::string &) { obs_source_t *scene_source = obs_get_source_by_name(scene_name); main->SetCurrentScene(scene_source, true); @@ -272,9 +271,8 @@ void OBSBasicSourceSelect::on_buttonBox_accepted() obs_scene_t *scene = obs_get_scene_by_name(scene_name); OBSSceneItem item; - auto cb = [](obs_scene_t *scene, - obs_sceneitem_t *sceneitem, void *data) { - UNUSED_PARAMETER(scene); + auto cb = [](obs_scene_t *, obs_sceneitem_t *sceneitem, + void *data) { OBSSceneItem &last = *reinterpret_cast(data); last = sceneitem; @@ -287,8 +285,7 @@ void OBSBasicSourceSelect::on_buttonBox_accepted() }; auto redo = [scene_name, main, source_name, - visible](const std::string &data) { - UNUSED_PARAMETER(data); + visible](const std::string &) { obs_source_t *scene_source = obs_get_source_by_name(scene_name); main->SetCurrentScene(scene_source, true); diff --git a/UI/window-basic-status-bar.cpp b/UI/window-basic-status-bar.cpp index 6ac4c64e0..d136b35b5 100644 --- a/UI/window-basic-status-bar.cpp +++ b/UI/window-basic-status-bar.cpp @@ -364,14 +364,12 @@ void OBSBasicStatusBar::OBSOutputReconnect(void *data, calldata_t *params) QMetaObject::invokeMethod(statusBar, "Reconnect", Q_ARG(int, seconds)); } -void OBSBasicStatusBar::OBSOutputReconnectSuccess(void *data, - calldata_t *params) +void OBSBasicStatusBar::OBSOutputReconnectSuccess(void *data, calldata_t *) { OBSBasicStatusBar *statusBar = reinterpret_cast(data); QMetaObject::invokeMethod(statusBar, "ReconnectSuccess"); - UNUSED_PARAMETER(params); } void OBSBasicStatusBar::Reconnect(int seconds) diff --git a/UI/window-missing-files.cpp b/UI/window-missing-files.cpp index aa06f39b2..b676b507e 100644 --- a/UI/window-missing-files.cpp +++ b/UI/window-missing-files.cpp @@ -49,7 +49,7 @@ MissingFilesPathItemDelegate::MissingFilesPathItemDelegate( QWidget *MissingFilesPathItemDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem & /* option */, - const QModelIndex &index) const + const QModelIndex &) const { QSizePolicy buttonSizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding, @@ -99,8 +99,6 @@ QWidget *MissingFilesPathItemDelegate::createEditor( container->setLayout(layout); container->setFocusProxy(text); - UNUSED_PARAMETER(index); - return container; } diff --git a/UI/window-projector.cpp b/UI/window-projector.cpp index 07254dc40..9b3fc5f2c 100644 --- a/UI/window-projector.cpp +++ b/UI/window-projector.cpp @@ -208,11 +208,10 @@ void OBSProjector::OBSRender(void *data, uint32_t cx, uint32_t cy) endRegion(); } -void OBSProjector::OBSSourceDestroyed(void *data, calldata_t *params) +void OBSProjector::OBSSourceDestroyed(void *data, calldata_t *) { OBSProjector *window = reinterpret_cast(data); QMetaObject::invokeMethod(window, "EscapeTriggered"); - UNUSED_PARAMETER(params); } void OBSProjector::mouseDoubleClickEvent(QMouseEvent *event)