From bdae3b35b472a9d05731c112c6327956c599a2ac Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 21 Jul 2025 23:28:21 +0200 Subject: [PATCH] Replaced deprecated QColorDialog::getRgba by QColorDialog::getColor --- retroshare-gui/src/gui/chat/ChatWidget.cpp | 7 +++---- retroshare-gui/src/gui/settings/ChatPage.cpp | 7 +++---- retroshare-gui/src/gui/settings/NewTag.cpp | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index 8b3864c8e..df0e8deff 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -1507,10 +1507,9 @@ void ChatWidget::on_markButton_clicked(bool bValue) void ChatWidget::chooseColor() { - bool ok; - QRgb color = QColorDialog::getRgba(currentColor.rgba(), &ok, window()); - if (ok) { - currentColor = QColor(color); + QColor color = QColorDialog::getColor(currentColor, window(), "", QColorDialog::ShowAlphaChannel); + if (color.isValid()) { + currentColor = color; PeerSettings->setPrivateChatColor(chatId, currentColor.name()); colorChanged(); setColorAndFont(false); diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 44afbf996..38cb81be0 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -686,10 +686,9 @@ void ChatPage::on_cbSearch_WithoutLimit_toggled(bool checked) void ChatPage::on_btSearch_FoundColor_clicked() { - bool ok; - QRgb color = QColorDialog::getRgba(rgbChatSearchFoundColor, &ok, window()); - if (ok) { - rgbChatSearchFoundColor=color; + QColor color = QColorDialog::getColor(QColor::fromRgba(rgbChatSearchFoundColor), window(), "", QColorDialog::ShowAlphaChannel); + if (color.isValid()) { + rgbChatSearchFoundColor = color.rgba(); QPixmap pix(24, 24); pix.fill(color); ui.btSearch_FoundColor->setIcon(pix); diff --git a/retroshare-gui/src/gui/settings/NewTag.cpp b/retroshare-gui/src/gui/settings/NewTag.cpp index 09489ad89..bfc1b16b9 100644 --- a/retroshare-gui/src/gui/settings/NewTag.cpp +++ b/retroshare-gui/src/gui/settings/NewTag.cpp @@ -123,10 +123,9 @@ void NewTag::textChanged(const QString &text) void NewTag::setTagColor() { - bool ok; - QRgb color = QColorDialog::getRgba(m_Color, &ok, this); - if (ok) { - m_Color = color; + QColor color = QColorDialog::getColor(QColor::fromRgba(m_Color), this, "", QColorDialog::ShowAlphaChannel); + if (color.isValid()) { + m_Color = color.rgba(); showColor (m_Color); } }