diff --git a/lib/legacy/scene-trigger.cpp b/lib/legacy/scene-trigger.cpp index ff45c021..50a998ab 100644 --- a/lib/legacy/scene-trigger.cpp +++ b/lib/legacy/scene-trigger.cpp @@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_triggerAdd_clicked() listAddClicked(ui->sceneTriggers, new SceneTriggerWidget(this, &switcher->sceneTriggers.back()), - ui->triggerAdd, addPulse); + addPulse); ui->triggerHelp->setVisible(false); } diff --git a/lib/legacy/switch-audio.cpp b/lib/legacy/switch-audio.cpp index 489daf0e..aca24b86 100644 --- a/lib/legacy/switch-audio.cpp +++ b/lib/legacy/switch-audio.cpp @@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_audioAdd_clicked() AudioSwitchWidget *sw = new AudioSwitchWidget(this, &switcher->audioSwitches.back()); - listAddClicked(ui->audioSwitches, sw, ui->audioAdd, addPulse); + listAddClicked(ui->audioSwitches, sw, addPulse); ui->audioHelp->setVisible(false); } diff --git a/lib/legacy/switch-executable.cpp b/lib/legacy/switch-executable.cpp index 59ff1671..96e06e7b 100644 --- a/lib/legacy/switch-executable.cpp +++ b/lib/legacy/switch-executable.cpp @@ -19,7 +19,7 @@ void AdvSceneSwitcher::on_executableAdd_clicked() listAddClicked(ui->executables, new ExecutableSwitchWidget( this, &switcher->executableSwitches.back()), - ui->executableAdd, addPulse); + addPulse); ui->exeHelp->setVisible(false); } diff --git a/lib/legacy/switch-file.cpp b/lib/legacy/switch-file.cpp index 617a851f..5d069bf3 100644 --- a/lib/legacy/switch-file.cpp +++ b/lib/legacy/switch-file.cpp @@ -291,7 +291,7 @@ void AdvSceneSwitcher::on_fileAdd_clicked() listAddClicked(ui->fileSwitches, new FileSwitchWidget(this, &switcher->fileSwitches.back()), - ui->fileAdd, addPulse); + addPulse); ui->fileHelp->setVisible(false); } diff --git a/lib/legacy/switch-media.cpp b/lib/legacy/switch-media.cpp index 29e61f80..956fa0dc 100644 --- a/lib/legacy/switch-media.cpp +++ b/lib/legacy/switch-media.cpp @@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_mediaAdd_clicked() listAddClicked(ui->mediaSwitches, new MediaSwitchWidget(this, &switcher->mediaSwitches.back()), - ui->mediaAdd, addPulse); + addPulse); ui->mediaHelp->setVisible(false); } diff --git a/lib/legacy/switch-pause.cpp b/lib/legacy/switch-pause.cpp index 324fba9d..a10d360d 100644 --- a/lib/legacy/switch-pause.cpp +++ b/lib/legacy/switch-pause.cpp @@ -20,7 +20,7 @@ void AdvSceneSwitcher::on_pauseAdd_clicked() listAddClicked(ui->pauseEntries, new PauseEntryWidget(this, &switcher->pauseEntries.back()), - ui->pauseAdd, addPulse); + addPulse); ui->pauseHelp->setVisible(false); } diff --git a/lib/legacy/switch-random.cpp b/lib/legacy/switch-random.cpp index 1a3d35ed..ecb8ab17 100644 --- a/lib/legacy/switch-random.cpp +++ b/lib/legacy/switch-random.cpp @@ -19,7 +19,7 @@ void AdvSceneSwitcher::on_randomAdd_clicked() listAddClicked(ui->randomSwitches, new RandomSwitchWidget(this, &switcher->randomSwitches.back()), - ui->randomAdd, addPulse); + addPulse); ui->randomHelp->setVisible(false); } diff --git a/lib/legacy/switch-screen-region.cpp b/lib/legacy/switch-screen-region.cpp index 24c6cfaf..9ca70820 100644 --- a/lib/legacy/switch-screen-region.cpp +++ b/lib/legacy/switch-screen-region.cpp @@ -79,7 +79,7 @@ void AdvSceneSwitcher::on_screenRegionAdd_clicked() listAddClicked(ui->screenRegionSwitches, new ScreenRegionWidget( this, &switcher->screenRegionSwitches.back()), - ui->screenRegionAdd, addPulse); + addPulse); ui->regionHelp->setVisible(false); } diff --git a/lib/legacy/switch-sequence.cpp b/lib/legacy/switch-sequence.cpp index 62ad2964..c0bdb1d4 100644 --- a/lib/legacy/switch-sequence.cpp +++ b/lib/legacy/switch-sequence.cpp @@ -26,7 +26,7 @@ void AdvSceneSwitcher::on_sceneSequenceAdd_clicked() listAddClicked(ui->sceneSequenceSwitches, new SequenceWidget( this, &switcher->sceneSequenceSwitches.back()), - ui->sceneSequenceAdd, addPulse); + addPulse); ui->sequenceHelp->setVisible(false); } diff --git a/lib/legacy/switch-time.cpp b/lib/legacy/switch-time.cpp index 2a3154e7..9b9d11b8 100644 --- a/lib/legacy/switch-time.cpp +++ b/lib/legacy/switch-time.cpp @@ -17,7 +17,7 @@ void AdvSceneSwitcher::on_timeAdd_clicked() listAddClicked(ui->timeSwitches, new TimeSwitchWidget(this, &switcher->timeSwitches.back()), - ui->timeAdd, addPulse); + addPulse); ui->timeHelp->setVisible(false); } diff --git a/lib/legacy/switch-video.cpp b/lib/legacy/switch-video.cpp index 8064390c..453aca44 100644 --- a/lib/legacy/switch-video.cpp +++ b/lib/legacy/switch-video.cpp @@ -24,7 +24,7 @@ void AdvSceneSwitcher::on_videoAdd_clicked() VideoSwitchWidget *sw = new VideoSwitchWidget(this, &switcher->videoSwitches.back()); - listAddClicked(ui->videoSwitches, sw, ui->videoAdd, addPulse); + listAddClicked(ui->videoSwitches, sw, addPulse); ui->videoHelp->setVisible(false); } diff --git a/lib/legacy/switch-window.cpp b/lib/legacy/switch-window.cpp index 87199409..e6406de1 100644 --- a/lib/legacy/switch-window.cpp +++ b/lib/legacy/switch-window.cpp @@ -21,7 +21,7 @@ void AdvSceneSwitcher::on_windowAdd_clicked() listAddClicked(ui->windowSwitches, new WindowSwitchWidget(this, &switcher->windowSwitches.back()), - ui->windowAdd, addPulse); + addPulse); ui->windowHelp->setVisible(false); } diff --git a/lib/macro/macro-input.cpp b/lib/macro/macro-input.cpp index 2d7488d0..80e65458 100644 --- a/lib/macro/macro-input.cpp +++ b/lib/macro/macro-input.cpp @@ -92,7 +92,7 @@ void MacroInputSelection::SetInputs(const MacroInputVariables &inputs) void MacroInputSelection::Add() { std::string varName; - bool accepted = VariableSelectionDialog::AskForVariable(this, varName); + bool accepted = VariableSelectionDialog::AskForVariable(varName); if (!accepted || varName.empty()) { return; @@ -155,7 +155,7 @@ void MacroInputSelection::Down() void MacroInputSelection::Clicked(QListWidgetItem *item) { std::string varName; - bool accepted = VariableSelectionDialog::AskForVariable(this, varName); + bool accepted = VariableSelectionDialog::AskForVariable(varName); if (!accepted || varName.empty()) { return; diff --git a/lib/macro/macro-list.cpp b/lib/macro/macro-list.cpp index 49a5ad9c..7625b354 100644 --- a/lib/macro/macro-list.cpp +++ b/lib/macro/macro-list.cpp @@ -79,7 +79,7 @@ void MacroList::MacroRemove(const QString &name) void MacroList::Add() { std::string macroName; - bool accepted = MacroSelectionDialog::AskForMacro(this, macroName); + bool accepted = MacroSelectionDialog::AskForMacro(macroName); if (!accepted || macroName.empty()) { return; @@ -132,7 +132,7 @@ void MacroList::Down() void MacroList::Clicked(QListWidgetItem *item) { std::string macroName; - bool accepted = MacroSelectionDialog::AskForMacro(this, macroName); + bool accepted = MacroSelectionDialog::AskForMacro(macroName); if (!accepted || macroName.empty()) { return; diff --git a/lib/macro/macro-selection.cpp b/lib/macro/macro-selection.cpp index 179b2fc5..739e039e 100644 --- a/lib/macro/macro-selection.cpp +++ b/lib/macro/macro-selection.cpp @@ -126,7 +126,7 @@ MacroSelectionDialog::MacroSelectionDialog(QWidget *parent) setLayout(layout); } -bool MacroSelectionDialog::AskForMacro(QWidget *parent, std::string ¯oName) +bool MacroSelectionDialog::AskForMacro(std::string ¯oName) { MacroSelectionDialog dialog(GetSettingsWindow()); dialog.setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle")); diff --git a/lib/macro/macro-selection.hpp b/lib/macro/macro-selection.hpp index f7a4fb12..4e23c84b 100644 --- a/lib/macro/macro-selection.hpp +++ b/lib/macro/macro-selection.hpp @@ -28,7 +28,7 @@ class MacroSelectionDialog : public QDialog { public: MacroSelectionDialog(QWidget *parent); - static bool AskForMacro(QWidget *parent, std::string ¯oName); + static bool AskForMacro(std::string ¯oName); private: MacroSelection *_macroSelection; diff --git a/lib/utils/utility.cpp b/lib/utils/utility.cpp index 791284b4..82e7dd7e 100644 --- a/lib/utils/utility.cpp +++ b/lib/utils/utility.cpp @@ -76,7 +76,7 @@ std::string ToString(double value) } void listAddClicked(QListWidget *list, QWidget *newWidget, - QPushButton *addButton, QObject *addHighlight) + QObject *addHighlight) { if (!list || !newWidget) { return; diff --git a/lib/utils/utility.hpp b/lib/utils/utility.hpp index baa763c3..53ad44ce 100644 --- a/lib/utils/utility.hpp +++ b/lib/utils/utility.hpp @@ -23,7 +23,6 @@ std::string ToString(double value); /* Legacy helpers */ void listAddClicked(QListWidget *list, QWidget *newWidget, - QPushButton *addButton = nullptr, QObject *addHighlight = nullptr); bool listMoveUp(QListWidget *list); bool listMoveDown(QListWidget *list); diff --git a/lib/variables/variable.cpp b/lib/variables/variable.cpp index 5ea0942a..565d5711 100644 --- a/lib/variables/variable.cpp +++ b/lib/variables/variable.cpp @@ -300,8 +300,7 @@ VariableSelectionDialog::VariableSelectionDialog(QWidget *parent) QWidget *GetSettingsWindow(); -bool VariableSelectionDialog::AskForVariable(QWidget *parent, - std::string &varName) +bool VariableSelectionDialog::AskForVariable(std::string &varName) { VariableSelectionDialog dialog(GetSettingsWindow()); dialog.setWindowTitle(obs_module_text("AdvSceneSwitcher.windowTitle")); diff --git a/lib/variables/variable.hpp b/lib/variables/variable.hpp index 1f45e71b..669b7d6e 100644 --- a/lib/variables/variable.hpp +++ b/lib/variables/variable.hpp @@ -89,7 +89,7 @@ class VariableSelectionDialog : public QDialog { public: VariableSelectionDialog(QWidget *parent); - static bool AskForVariable(QWidget *parent, std::string &variableName); + static bool AskForVariable(std::string &variableName); private: VariableSelection *_variableSelection; diff --git a/plugins/base/utils/transform-setting.cpp b/plugins/base/utils/transform-setting.cpp index 153e68a8..2d603010 100644 --- a/plugins/base/utils/transform-setting.cpp +++ b/plugins/base/utils/transform-setting.cpp @@ -84,8 +84,8 @@ GetTransformSettingValue(obs_scene_item *source, } template -static void logConversionError(T exception, const char *func, - const char *target, const char *value) +static void logConversionError(T, const char *func, const char *target, + const char *value) { if (std::is_same::value) { blog(LOG_WARNING, "%s invalid %s value (%s)", func, target, diff --git a/plugins/twitch/macro-condition-twitch.cpp b/plugins/twitch/macro-condition-twitch.cpp index ccb2339c..155ce73b 100644 --- a/plugins/twitch/macro-condition-twitch.cpp +++ b/plugins/twitch/macro-condition-twitch.cpp @@ -285,7 +285,7 @@ setTempVarsHelper(obs_data_t *data, setTempVarsHelper(jsonStr, setVar); } -bool MacroConditionTwitch::CheckChannelGenericEvents(TwitchToken &token) +bool MacroConditionTwitch::CheckChannelGenericEvents() { if (!_eventBuffer) { return false; @@ -315,7 +315,7 @@ bool MacroConditionTwitch::CheckChannelGenericEvents(TwitchToken &token) return false; } -bool MacroConditionTwitch::CheckChannelLiveEvents(TwitchToken &token) +bool MacroConditionTwitch::CheckChannelLiveEvents() { if (!_eventBuffer) { return false; @@ -541,13 +541,13 @@ bool MacroConditionTwitch::CheckCondition() case Condition::USER_UNBAN_EVENT: case Condition::USER_MODERATOR_ADDITION_EVENT: case Condition::USER_MODERATOR_DELETION_EVENT: - return CheckChannelGenericEvents(*token); + return CheckChannelGenericEvents(); case Condition::STREAM_ONLINE_LIVE_EVENT: case Condition::STREAM_ONLINE_PLAYLIST_EVENT: case Condition::STREAM_ONLINE_WATCHPARTY_EVENT: case Condition::STREAM_ONLINE_PREMIERE_EVENT: case Condition::STREAM_ONLINE_RERUN_EVENT: - return CheckChannelLiveEvents(*token); + return CheckChannelLiveEvents(); case Condition::LIVE_POLLING: { auto info = _channel.GetLiveInfo(*token); if (!info) { diff --git a/plugins/twitch/macro-condition-twitch.hpp b/plugins/twitch/macro-condition-twitch.hpp index 29487c8d..3d5c0180 100644 --- a/plugins/twitch/macro-condition-twitch.hpp +++ b/plugins/twitch/macro-condition-twitch.hpp @@ -107,8 +107,8 @@ public: bool _clearBufferOnMatch = false; private: - bool CheckChannelGenericEvents(TwitchToken &token); - bool CheckChannelLiveEvents(TwitchToken &token); + bool CheckChannelGenericEvents(); + bool CheckChannelLiveEvents(); bool CheckChatMessages(TwitchToken &token); void RegisterEventSubscription(); diff --git a/plugins/usb/usb-helpers.cpp b/plugins/usb/usb-helpers.cpp index 80190584..9bd0010d 100644 --- a/plugins/usb/usb-helpers.cpp +++ b/plugins/usb/usb-helpers.cpp @@ -103,7 +103,7 @@ static std::vector pollUSBDevices() return result; } -static int hotplugCallback(struct libusb_context *ctx, +static int hotplugCallback(struct libusb_context *, struct libusb_device *device, libusb_hotplug_event event, void *user_data) {