From: gg Date: Sat, 10 Jan 2026 05:13:33 +0000 (-0500) Subject: more deprecation warning/Qt6 stuff X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=7e93b8fd4083e1e4d0d04fda0569fb6f3d3117b1;p=gamesguru%2Ffeather.git more deprecation warning/Qt6 stuff --- diff --git a/src/plugins/crowdfunding/CCSProgressDelegate.cpp b/src/plugins/crowdfunding/CCSProgressDelegate.cpp index c915d24d..021b36ea 100644 --- a/src/plugins/crowdfunding/CCSProgressDelegate.cpp +++ b/src/plugins/crowdfunding/CCSProgressDelegate.cpp @@ -23,7 +23,7 @@ void CCSProgressDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o progressBarOption.state = QStyle::State_Enabled; progressBarOption.direction = QApplication::layoutDirection(); progressBarOption.rect = option.rect; - progressBarOption.fontMetrics = QApplication::fontMetrics(); + progressBarOption.fontMetrics = QFontMetrics(qApp->font()); progressBarOption.minimum = 0; progressBarOption.maximum = 100; progressBarOption.textAlignment = Qt::AlignCenter; diff --git a/src/qrcode/utils/QrCodeUtils.cpp b/src/qrcode/utils/QrCodeUtils.cpp index e957780f..ee3841eb 100644 --- a/src/qrcode/utils/QrCodeUtils.cpp +++ b/src/qrcode/utils/QrCodeUtils.cpp @@ -3,14 +3,14 @@ #include "QrCodeUtils.h" -Result QrCodeUtils::ReadBarcode(const QImage& img, const ZXing::DecodeHints& hints) +Result QrCodeUtils::ReadBarcode(const QImage& img, const ZXing::ReaderOptions& hints) { auto ImgFmtFromQImg = [](const QImage& img){ switch (img.format()) { case QImage::Format_ARGB32: case QImage::Format_RGB32: #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN - return ZXing::ImageFormat::BGRX; + return ZXing::ImageFormat::BGRA; #else return ZXing::ImageFormat::XRGB; @@ -21,7 +21,7 @@ Result QrCodeUtils::ReadBarcode(const QImage& img, const ZXing::DecodeHints& hin case QImage::Format_RGBX8888: case QImage::Format_RGBA8888: - return ZXing::ImageFormat::RGBX; + return ZXing::ImageFormat::RGBA; case QImage::Format_Grayscale8: return ZXing::ImageFormat::Lum; @@ -50,7 +50,7 @@ Result QrCodeUtils::ReadBarcode(const QImage& img, const ZXing::DecodeHints& hin QString QrCodeUtils::scanImage(const QImage &img) { - const auto hints = ZXing::DecodeHints() + const auto hints = ZXing::ReaderOptions() .setFormats(ZXing::BarcodeFormat::QRCode | ZXing::BarcodeFormat::DataMatrix) .setTryHarder(true) .setBinarizer(ZXing::Binarizer::FixedThreshold); diff --git a/src/qrcode/utils/QrCodeUtils.h b/src/qrcode/utils/QrCodeUtils.h index 305bc968..b41c7be0 100644 --- a/src/qrcode/utils/QrCodeUtils.h +++ b/src/qrcode/utils/QrCodeUtils.h @@ -27,7 +27,7 @@ private: class QrCodeUtils { public: static QString scanImage(const QImage &img); - static Result ReadBarcode(const QImage& img, const ZXing::DecodeHints& hints = { }); + static Result ReadBarcode(const QImage& img, const ZXing::ReaderOptions& hints = { }); }; #endif //FEATHER_QRCODEUTILS_H diff --git a/src/utils/WebsocketClient.cpp b/src/utils/WebsocketClient.cpp index 815666bf..fd0e089a 100644 --- a/src/utils/WebsocketClient.cpp +++ b/src/utils/WebsocketClient.cpp @@ -20,7 +20,7 @@ WebsocketClient::WebsocketClient(QObject *parent) connect(webSocket, &QWebSocket::stateChanged, this, &WebsocketClient::onStateChanged); connect(webSocket, &QWebSocket::connected, this, &WebsocketClient::onConnected); connect(webSocket, &QWebSocket::disconnected, this, &WebsocketClient::onDisconnected); - connect(webSocket, QOverload::of(&QWebSocket::error), this, &WebsocketClient::onError); + connect(webSocket, &QWebSocket::errorOccurred, this, &WebsocketClient::onError); connect(webSocket, &QWebSocket::binaryMessageReceived, this, &WebsocketClient::onbinaryMessageReceived); diff --git a/src/widgets/NodeWidget.cpp b/src/widgets/NodeWidget.cpp index b2c94e77..b01e5d23 100644 --- a/src/widgets/NodeWidget.cpp +++ b/src/widgets/NodeWidget.cpp @@ -21,8 +21,8 @@ NodeWidget::NodeWidget(QWidget *parent) connect(ui->btn_addCustomNodes, &QPushButton::clicked, this, &NodeWidget::onCustomAddClicked); - connect(ui->checkBox_websocketList, &QCheckBox::stateChanged, [this](int id){ - bool custom = (id == 0); + connect(ui->checkBox_websocketList, &QCheckBox::checkStateChanged, [this](Qt::CheckState state){ + bool custom = (state == Qt::Unchecked); ui->stackedWidget->setCurrentIndex(custom); ui->frame_addCustomNodes->setVisible(custom); conf()->set(Config::nodeSource, custom);