jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-08 17:13:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove more qt checks up to min version (6.4)

Browse source
This commit is contained in:
tooomm 2026-07-07 17:32:33 +02:00
parent 9b02dae1fa
commit 544906042a
3 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
View file

@ -636,19 +636,12 @@ void UserInfoPopup::refreshGames()
// ── Mouse events ────────────────────────────────────────────────────────────── // ── Mouse events ──────────────────────────────────────────────────────────────
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void UserInfoPopup::enterEvent(QEnterEvent *e) void UserInfoPopup::enterEvent(QEnterEvent *e)
{ {
QFrame::enterEvent(e); QFrame::enterEvent(e);
emit mouseEnteredPopup(); emit mouseEnteredPopup();
} }
#else
void UserInfoPopup::enterEvent(QEvent *e)
{
QFrame::enterEvent(e);
emit mouseEnteredPopup();
}
#endif
void UserInfoPopup::leaveEvent(QEvent *e) void UserInfoPopup::leaveEvent(QEvent *e)
{ {
QFrame::leaveEvent(e); QFrame::leaveEvent(e);

4
cockatrice/src/interface/widgets/server/user/user_info_popup.h
View file

@ -143,11 +143,7 @@ signals:
void demoteFromJudgeRequested(const QString &userName); void demoteFromJudgeRequested(const QString &userName);
protected: protected:
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent *e) override; void enterEvent(QEnterEvent *e) override;
#else
void enterEvent(QEvent *e) override;
#endif
void leaveEvent(QEvent *e) override; void leaveEvent(QEvent *e) override;
private slots: private slots:

10
cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
View file

@ -138,12 +138,7 @@ MessagesSettingsPage::MessagesSettingsPage()
void MessagesSettingsPage::updateColor(const QString &value) void MessagesSettingsPage::updateColor(const QString &value)
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
QColor colorToSet = QColor::fromString("#" + value); QColor colorToSet = QColor::fromString("#" + value);
#else
QColor colorToSet;
colorToSet.setNamedColor("#" + value);
#endif
if (colorToSet.isValid()) { if (colorToSet.isValid()) {
SettingsCache::instance().setChatMentionColor(value); SettingsCache::instance().setChatMentionColor(value);
updateMentionPreview(); updateMentionPreview();
@ -152,12 +147,7 @@ void MessagesSettingsPage::updateColor(const QString &value)
void MessagesSettingsPage::updateHighlightColor(const QString &value) void MessagesSettingsPage::updateHighlightColor(const QString &value)
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
QColor colorToSet = QColor::fromString("#" + value); QColor colorToSet = QColor::fromString("#" + value);
#else
QColor colorToSet;
colorToSet.setNamedColor("#" + value);
#endif
if (colorToSet.isValid()) { if (colorToSet.isValid()) {
SettingsCache::instance().setChatHighlightColor(value); SettingsCache::instance().setChatHighlightColor(value);
updateHighlightPreview(); updateHighlightPreview();