From 28c47725e25e39e03bd217231db3dcf613a4c70a Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Fri, 25 Mar 2022 18:17:14 +0100
Subject: [PATCH] do not like protected keywords in macros

---
 src/controls/QskEvent.h | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/controls/QskEvent.h b/src/controls/QskEvent.h
index 79219abd..83dd0b5f 100644
--- a/src/controls/QskEvent.h
+++ b/src/controls/QskEvent.h
@@ -23,18 +23,11 @@ class QWheelEvent;
 class QHoverEvent;
 class QKeyEvent;
 
-#ifdef Q_EVENT_DISABLE_COPY
-
-    #define QSK_EVENT_DISABLE_COPY Q_EVENT_DISABLE_COPY;
-
-#else
-    #define QSK_EVENT_DISABLE_COPY(Class) \
-        protected: \
-            Class(const Class &) = default; \
-            Class(Class &&) = delete; \
-            Class &operator=(const Class &other) = default; \
-            Class &operator=(Class &&) = delete;
-#endif
+#define QSK_EVENT_DISABLE_COPY(Class) \
+        Class(const Class &) = default; \
+        Class(Class &&) = delete; \
+        Class &operator=(const Class &other) = default; \
+        Class &operator=(Class &&) = delete;
 
 class QSK_EXPORT QskEvent : public QEvent
 {
@@ -66,9 +59,8 @@ class QSK_EXPORT QskEvent : public QEvent
     virtual QskEvent* clone() const;
 #endif
 
-  private:
+  protected:
     QSK_EVENT_DISABLE_COPY( QskEvent )
-
 };
 
 class QSK_EXPORT QskGeometryChangeEvent : public QskEvent
@@ -84,9 +76,10 @@ class QSK_EXPORT QskGeometryChangeEvent : public QskEvent
 
     QskGeometryChangeEvent* clone() const override;
 
-  private:
+  protected:
     QSK_EVENT_DISABLE_COPY( QskGeometryChangeEvent )
 
+  private:
     const QRectF m_rect;
     const QRectF m_oldRect;
 };
@@ -101,9 +94,10 @@ class QSK_EXPORT QskWindowChangeEvent : public QskEvent
 
     QskWindowChangeEvent* clone() const override;
 
-  private:
+  protected:
     QSK_EVENT_DISABLE_COPY( QskWindowChangeEvent )
 
+  private:
     QQuickWindow* const m_oldWindow;
     QQuickWindow* const m_window;
 };
@@ -117,9 +111,10 @@ class QSK_EXPORT QskPopupEvent : public QskEvent
 
     QskPopupEvent* clone() const override;
 
-  private:
+  protected:
     QSK_EVENT_DISABLE_COPY( QskPopupEvent )
 
+  private:
     QskPopup* const m_popup;
 };
 
@@ -132,9 +127,10 @@ class QSK_EXPORT QskGestureEvent : public QskEvent
 
     QskGestureEvent* clone() const override;
 
-  private:
+  protected:
     QSK_EVENT_DISABLE_COPY( QskGestureEvent )
 
+  private:
     std::shared_ptr< const QskGesture > m_gesture;
 };
 
@@ -154,9 +150,10 @@ class QSK_EXPORT QskAnimatorEvent : public QskEvent
 
     QskAnimatorEvent* clone() const override;
 
-  private:
+  protected:
     QSK_EVENT_DISABLE_COPY( QskAnimatorEvent )
 
+  private:
     const QskAspect m_aspect;
     const State m_state;
 };