Fix remaining Qt6 build warnings (narrowing, nodiscard, qHash)

Clears the 9 non-deprecation warnings from the Qt6 build:
- qHash(QColor): hash rgba() (unambiguous QRgb) instead of name(), and
  use the size_t seed signature on Qt6 (guarded for Qt5). Fixes the
  ambiguous-overload warning in terminalstripmodel.h.
- Two qsizetype->int narrowings in brace-init: explicit static_cast<int>
  (elementscene.cpp, terminalstrip.cpp).
- main.cpp: keep the QtConcurrent::run QFuture in a [[maybe_unused]]
  variable (nodiscard).
- qetapp.cpp: guard the stylesheet load on QFile::open() succeeding
  (nodiscard) instead of ignoring the result.
This commit is contained in:
Dieter Mayer
2026-07-12 23:20:30 +02:00
parent 5c65bf6486
commit a0f66d22cc
5 changed files with 16 additions and 9 deletions
+1 -1
View File
@@ -639,7 +639,7 @@ bool TerminalStrip::isBridgeable(const QVector<QSharedPointer<RealTerminal>> &re
// Get the physical terminal and pos // Get the physical terminal and pos
auto first_physical_terminal = first_real_terminal->physicalTerminal(); auto first_physical_terminal = first_real_terminal->physicalTerminal();
QVector<shared_physical_terminal> physical_vector{first_physical_terminal}; QVector<shared_physical_terminal> physical_vector{first_physical_terminal};
QVector<int> pos_vector{m_physical_terminals.indexOf(first_physical_terminal)}; QVector<int> pos_vector{static_cast<int>(m_physical_terminals.indexOf(first_physical_terminal))};
auto bridge_ = isBridged(first_real_terminal); auto bridge_ = isBridged(first_real_terminal);
//bool to know at the end of this function if at least one terminal is not bridged //bool to know at the end of this function if at least one terminal is not bridged
@@ -29,9 +29,15 @@
#include "modelTerminalData.h" #include "modelTerminalData.h"
//Code to use QColor as key for QHash //Code to use QColor as key for QHash
inline uint qHash(const QColor &key, uint seed) { #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return qHash(key.name(), seed); inline size_t qHash(const QColor &key, size_t seed = 0) {
return qHash(key.rgba(), seed);
} }
#else
inline uint qHash(const QColor &key, uint seed) {
return qHash(key.rgba(), seed);
}
#endif
//needed to use QPointer<Element> as key of QHash //needed to use QPointer<Element> as key of QHash
inline uint qHash(const QPointer<Element> &key, uint seed) { inline uint qHash(const QPointer<Element> &key, uint seed) {
+1 -1
View File
@@ -748,7 +748,7 @@ void ElementScene::addItems(QVector<QGraphicsItem *> items)
*/ */
void ElementScene::removeItems(QVector<QGraphicsItem *> items) void ElementScene::removeItems(QVector<QGraphicsItem *> items)
{ {
const int previous_selected_count{selectedItems().size()}; const int previous_selected_count = static_cast<int>(selectedItems().size());
//block signal to avoid multiple emit of selection changed, //block signal to avoid multiple emit of selection changed,
//we emit this signal only once at the end of this function. //we emit this signal only once at the end of this function.
+1 -1
View File
@@ -289,7 +289,7 @@ QGuiApplication::setHighDpiScaleFactorRoundingPolicy(QetSettings::hdpiScaleFacto
// here guarantees the singleton is fully built before the worker runs. // here guarantees the singleton is fully built before the worker runs.
MachineInfo::instance(); MachineInfo::instance();
QtConcurrent::run([=]() [[maybe_unused]] auto startup_future = QtConcurrent::run([=]()
{ {
// for debugging // for debugging
qInstallMessageHandler(myMessageOutput); qInstallMessageHandler(myMessageOutput);
+5 -4
View File
@@ -1697,10 +1697,11 @@ void QETApp::useSystemPalette(bool use) {
); );
} else { } else {
QFile file(configDir() + "/style.css"); QFile file(configDir() + "/style.css");
file.open(QFile::ReadOnly); if (file.open(QFile::ReadOnly)) {
QString styleSheet = QLatin1String(file.readAll()); QString styleSheet = QLatin1String(file.readAll());
qApp->setStyleSheet(styleSheet); qApp->setStyleSheet(styleSheet);
file.close(); file.close();
}
} }
} }