diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp index 2b4dcb8ed..74e567dde 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp @@ -636,19 +636,12 @@ void UserInfoPopup::refreshGames() // ── Mouse events ────────────────────────────────────────────────────────────── -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) void UserInfoPopup::enterEvent(QEnterEvent *e) { QFrame::enterEvent(e); emit mouseEnteredPopup(); } -#else -void UserInfoPopup::enterEvent(QEvent *e) -{ - QFrame::enterEvent(e); - emit mouseEnteredPopup(); -} -#endif + void UserInfoPopup::leaveEvent(QEvent *e) { QFrame::leaveEvent(e); diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.h b/cockatrice/src/interface/widgets/server/user/user_info_popup.h index 0e03147c4..69517093f 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_popup.h +++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.h @@ -143,11 +143,7 @@ signals: void demoteFromJudgeRequested(const QString &userName); protected: -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) void enterEvent(QEnterEvent *e) override; -#else - void enterEvent(QEvent *e) override; -#endif void leaveEvent(QEvent *e) override; private slots: diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp index 831cb442c..feecb703a 100644 --- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp @@ -138,12 +138,7 @@ MessagesSettingsPage::MessagesSettingsPage() void MessagesSettingsPage::updateColor(const QString &value) { -#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) QColor colorToSet = QColor::fromString("#" + value); -#else - QColor colorToSet; - colorToSet.setNamedColor("#" + value); -#endif if (colorToSet.isValid()) { SettingsCache::instance().setChatMentionColor(value); updateMentionPreview(); @@ -152,12 +147,7 @@ void MessagesSettingsPage::updateColor(const QString &value) void MessagesSettingsPage::updateHighlightColor(const QString &value) { -#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) QColor colorToSet = QColor::fromString("#" + value); -#else - QColor colorToSet; - colorToSet.setNamedColor("#" + value); -#endif if (colorToSet.isValid()) { SettingsCache::instance().setChatHighlightColor(value); updateHighlightPreview();