Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 4cae57ab rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Avoid some warnings

parent 38319b3b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!19Fake vim
......@@ -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")
......
......@@ -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(", ");
}
......
......@@ -15,6 +15,8 @@
#include <type_traits>
#include <chrono>
#define VIVY_UNUSED __attribute__((unused))
// Use chrono instead of std::chrono...
namespace chrono = std::chrono;
......
......@@ -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;
}
......
......@@ -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;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter