diff --git a/src/legacy/switch-file.cpp b/src/legacy/switch-file.cpp index 101899d2..9beef18f 100644 --- a/src/legacy/switch-file.cpp +++ b/src/legacy/switch-file.cpp @@ -119,7 +119,7 @@ void SwitcherData::writeToStatusFile(const QString &msg) if (file.open(QIODevice::ReadWrite)) { QTextStream stream(&file); #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - stream << msg << endl; + stream << msg << "\n"; #else stream << msg << Qt::endl; #endif diff --git a/src/macro-core/macro-tree.cpp b/src/macro-core/macro-tree.cpp index e743cb46..2b39e931 100644 --- a/src/macro-core/macro-tree.cpp +++ b/src/macro-core/macro-tree.cpp @@ -212,7 +212,7 @@ static inline int ModelIndexToMacroIndex(int modelIdx, const std::deque> ¯os) { - assert(macros.size() >= modelIdx); + assert((int)macros.size() >= modelIdx); int realIdx = 0; const auto &m = macros[0]; bool inCollapsedGroup = m->IsGroup() && m->IsCollapsed(); diff --git a/src/macro-external/midi/midi-helpers.cpp b/src/macro-external/midi/midi-helpers.cpp index fbc9869e..c9457b75 100644 --- a/src/macro-external/midi/midi-helpers.cpp +++ b/src/macro-external/midi/midi-helpers.cpp @@ -920,7 +920,6 @@ QStringList GetAllNotes() "F#", "G", "G#", "A", "A#", "B"}; for (int octave = -1; octave <= 9; octave++) { for (int noteIndex = 0; noteIndex < 12; noteIndex++) { - int midiNote = octave * 12 + noteIndex; result << notes[noteIndex] + QString::number(octave); } } diff --git a/src/macro-external/twitch/category-selection.cpp b/src/macro-external/twitch/category-selection.cpp index 41f7a5e8..e950fb59 100644 --- a/src/macro-external/twitch/category-selection.cpp +++ b/src/macro-external/twitch/category-selection.cpp @@ -110,7 +110,7 @@ void TwitchCategorySelection::showPopup() bool TwitchCategorySelection::IsPopulated() { - return count() == _categoryGrabber.GetCategories().size() && + return count() == (int)_categoryGrabber.GetCategories().size() && _fetchingCategoriesDone; } diff --git a/src/macro-external/twitch/macro-action-twitch.cpp b/src/macro-external/twitch/macro-action-twitch.cpp index 17f06f18..689919f5 100644 --- a/src/macro-external/twitch/macro-action-twitch.cpp +++ b/src/macro-external/twitch/macro-action-twitch.cpp @@ -120,9 +120,9 @@ void MacroActionTwitch::StartCommercial( obs_data_array_item(replyArray, 0); blog(LOG_INFO, "Failed to start commercial! (%d)\n" - "length: %d\n" + "length: %lld\n" "message: %s\n" - "retry_after: %d\n", + "retry_after: %lld\n", result.status, obs_data_get_int(replyData, "length"), obs_data_get_string(replyData, "message"), obs_data_get_int(replyData, "retry_after")); diff --git a/src/macro-external/video/opencv-helpers.cpp b/src/macro-external/video/opencv-helpers.cpp index b37b5429..74b1b2e3 100644 --- a/src/macro-external/video/opencv-helpers.cpp +++ b/src/macro-external/video/opencv-helpers.cpp @@ -178,6 +178,9 @@ cv::Mat PreprocessForOCR(const QImage &image, const QColor &textColor, std::string RunOCR(tesseract::TessBaseAPI *ocr, const QImage &image, const QColor &color, double colorDiff) { + (void)ocr; + (void)color; + (void)colorDiff; if (image.isNull()) { return ""; } diff --git a/src/macro-external/video/preview-dialog.cpp b/src/macro-external/video/preview-dialog.cpp index c76765af..1443d888 100644 --- a/src/macro-external/video/preview-dialog.cpp +++ b/src/macro-external/video/preview-dialog.cpp @@ -112,7 +112,7 @@ void PreviewDialog::Stop() _thread.wait(); } -void PreviewDialog::closeEvent(QCloseEvent *event) +void PreviewDialog::closeEvent(QCloseEvent *) { Stop(); } diff --git a/src/utils/websocket-helpers.cpp b/src/utils/websocket-helpers.cpp index 530dcbe2..a5dddf1c 100644 --- a/src/utils/websocket-helpers.cpp +++ b/src/utils/websocket-helpers.cpp @@ -229,7 +229,7 @@ void WSConnection::UseOBSWebsocketProtocol(bool useOBSProtocol) this, _1, _2)); } -void WSConnection::OnGenericOpen(connection_hdl hdl) +void WSConnection::OnGenericOpen(connection_hdl) { blog(LOG_INFO, "connection to %s opened", _uri.c_str()); _status = Status::AUTHENTICATED; @@ -317,8 +317,7 @@ void WSConnection::HandleResponse(obs_data_t *response) obs_data_release(data); } -void WSConnection::OnGenericMessage(connection_hdl hdl, - client::message_ptr message) +void WSConnection::OnGenericMessage(connection_hdl, client::message_ptr message) { if (!message) { return;