From f38b72e7a3fcdcece6caf8120e4ec4240867fa63 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sat, 19 Jul 2025 19:45:04 +0200
Subject: [PATCH] Changed parameter of method enterEvent on ClickableLabel and
 ZoomableLabel for Qt 6 to QEnterEvent

---
 .../gxschannels/GxsChannelPostThumbnail.cpp    | 18 ++++++++++++++++++
 .../gui/gxschannels/GxsChannelPostThumbnail.h  |  8 ++++++--
 retroshare-gui/src/util/ClickableLabel.cpp     | 18 ++++++++++++++++++
 retroshare-gui/src/util/ClickableLabel.h       |  8 ++++++--
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
index 16cf96195..560c37577 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
@@ -309,6 +309,24 @@ void ZoomableLabel::wheelEvent(QWheelEvent *me)
     updateView();
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
+void ZoomableLabel::enterEvent(QEnterEvent* /*event*/)
+#else
+void ZoomableLabel::enterEvent(QEvent* /*event*/)
+#endif
+{
+    if (mUseStyleSheet) {
+        setStyleSheet("QLabel { border: 2px solid #039bd5; }");
+    }
+}
+
+void ZoomableLabel::ZoomableLabel::leaveEvent(QEvent* /*event*/)
+{
+    if (mUseStyleSheet) {
+        setStyleSheet("QLabel { border: 2px solid #CCCCCC; border-radius: 3px; }");
+    }
+}
+
 QPixmap ZoomableLabel::extractCroppedScaledPicture() const
 {
     QRect rect(mCenterX - 0.5 * width()*mZoomFactor, mCenterY - 0.5 * height()*mZoomFactor, width()*mZoomFactor, height()*mZoomFactor);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h
index 7ee928f9e..da30f2083 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h
@@ -64,8 +64,12 @@ protected:
     void resizeEvent(QResizeEvent *ev) override;
     void wheelEvent(QWheelEvent *me) override;
 
-    void enterEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #039bd5; }");}
-    void leaveEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #CCCCCC; border-radius: 3px; }");}
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
+    void enterEvent(QEnterEvent *event) override;
+#else
+    void enterEvent(QEvent *event) override;
+#endif
+    void leaveEvent(QEvent *event) override;
 
     bool mUseStyleSheet;
 
diff --git a/retroshare-gui/src/util/ClickableLabel.cpp b/retroshare-gui/src/util/ClickableLabel.cpp
index 6bbd5ca4a..ee16abdc8 100644
--- a/retroshare-gui/src/util/ClickableLabel.cpp
+++ b/retroshare-gui/src/util/ClickableLabel.cpp
@@ -33,3 +33,21 @@ ClickableLabel::~ClickableLabel() {
 void ClickableLabel::mousePressEvent(QMouseEvent* /*event*/) {
     emit clicked();
 }
+
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
+void ClickableLabel::enterEvent(QEnterEvent* /*event*/)
+#else
+void ClickableLabel::enterEvent(QEvent* /*event*/)
+#endif
+{
+    if (mUseStyleSheet) {
+        setStyleSheet("QLabel { border: 2px solid #039bd5; }");
+    }
+}
+
+void ClickableLabel::leaveEvent(QEvent* /*event*/)
+{
+    if (mUseStyleSheet) {
+        setStyleSheet("");
+    }
+}
diff --git a/retroshare-gui/src/util/ClickableLabel.h b/retroshare-gui/src/util/ClickableLabel.h
index 54b3499d8..610a1eabd 100644
--- a/retroshare-gui/src/util/ClickableLabel.h
+++ b/retroshare-gui/src/util/ClickableLabel.h
@@ -39,8 +39,12 @@ signals:
 protected:
     void mousePressEvent(QMouseEvent* event) override;
 
-    void enterEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #039bd5; }");}
-    void leaveEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("");}
+#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
+    void enterEvent(QEnterEvent* event) override;
+#else
+    void enterEvent(QEvent* event) override;
+#endif
+    void leaveEvent(QEvent* event) override;
 
     bool mUseStyleSheet;
 };