From 4cae57ab2f510fafabc66204b5dd0ad962858dd5 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Fri, 20 Aug 2021 14:33:24 +0200
Subject: [PATCH] BUILD: Avoid some warnings
---
CMakeLists.txt | 7 ++++++-
src/Lib/Document/VivyDocument.cc | 9 ++++++---
src/Lib/Utils.hh | 2 ++
src/UI/AboutWindow.cc | 4 ++--
src/UI/DocumentViews/MpvContainer.cc | 2 +-
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index deade37d..0b90ba61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,12 @@ target_compile_options(Vivy PRIVATE
target_link_libraries(Vivy PRIVATE -fopenmp)
# Prepare for Qt6
-target_compile_definitions(Vivy PRIVATE QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
+target_compile_definitions(Vivy PRIVATE
+ QT_DISABLE_DEPRECATED_BEFORE=0x050F00
+ QT_NO_CAST_TO_ASCII
+ # QT_RESTRICTED_CAST_FROM_ASCII
+ QTCREATOR_UTILS_STATIC_LIB
+)
# Some compiler specific warnings and options
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
diff --git a/src/Lib/Document/VivyDocument.cc b/src/Lib/Document/VivyDocument.cc
index 54c43372..ae4c1235 100644
--- a/src/Lib/Document/VivyDocument.cc
+++ b/src/Lib/Document/VivyDocument.cc
@@ -152,11 +152,14 @@ VivyDocument::getDocumentCapabilitiesString() const noexcept
{
QStringList ret;
if (documentType & AudioAble)
- ret.push_back("AudioAble" + QString(audioDocument ? "" : "(ack)"));
+ ret.push_back("AudioAble" +
+ QString(audioDocument ? QStringLiteral("") : QStringLiteral("(ack)")));
if (documentType & VideoAble)
- ret.push_back("VideoAble" + QString(videoDocument ? "" : "(ack)"));
+ ret.push_back("VideoAble" +
+ QString(videoDocument ? QStringLiteral("") : QStringLiteral("(ack)")));
if (documentType & AssAble)
- ret.push_back("AssAble" + QString(assDocument ? "" : "(ack)"));
+ ret.push_back("AssAble" +
+ QString(assDocument ? QStringLiteral("") : QStringLiteral("(ack)")));
return ret.join(", ");
}
diff --git a/src/Lib/Utils.hh b/src/Lib/Utils.hh
index bf61eedb..65d85243 100644
--- a/src/Lib/Utils.hh
+++ b/src/Lib/Utils.hh
@@ -15,6 +15,8 @@
#include <type_traits>
#include <chrono>
+#define VIVY_UNUSED __attribute__((unused))
+
// Use chrono instead of std::chrono...
namespace chrono = std::chrono;
diff --git a/src/UI/AboutWindow.cc b/src/UI/AboutWindow.cc
index 90b25a0b..6c779132 100644
--- a/src/UI/AboutWindow.cc
+++ b/src/UI/AboutWindow.cc
@@ -43,7 +43,7 @@ AboutWindow::SimpleLabel::SimpleLabel(QWidget *parent, const char *text)
setTextFormat(Qt::RichText);
setTextInteractionFlags(Qt::NoTextInteraction | Qt::LinksAccessibleByMouse |
Qt::LinksAccessibleByKeyboard);
- setText(text);
+ setText(QString(text));
setAlignment(Qt::AlignJustify | Qt::AlignTop);
}
@@ -68,7 +68,7 @@ AboutWindow::LicenceLabel::LicenceLabel(QWidget *parent, const QString &url,
switch (format) {
case Qt::PlainText:
- case Qt::RichText: setText(content.readAll()); break;
+ case Qt::RichText: setText(QString(content.readAll())); break;
case Qt::MarkdownText: setMarkdown(content.readAll()); break;
case Qt::AutoText: qCritical() << "Invalid text format for LicenceLabel" << format;
}
diff --git a/src/UI/DocumentViews/MpvContainer.cc b/src/UI/DocumentViews/MpvContainer.cc
index d3fdd966..ef64b08f 100644
--- a/src/UI/DocumentViews/MpvContainer.cc
+++ b/src/UI/DocumentViews/MpvContainer.cc
@@ -106,7 +106,7 @@ MpvContainer::handleMpvEvent(mpv_event *event) noexcept
case MPV_EVENT_LOG_MESSAGE:
msg = reinterpret_cast<mpv_event_log_message *>(event->data);
- msgText = msg->text;
+ msgText = QString(msg->text);
msgText.replace('\n', "");
qDebug().nospace().noquote()
<< "MPV - MSG [" << msg->prefix << "] " << msg->level << ": " << msgText;
--
GitLab