peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not like protected keywords in macros

Browse Source
This commit is contained in:
Uwe Rathmann 2022-03-25 18:17:14 +01:00
parent d6c4968d3c
commit 28c47725e2
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/controls/QskEvent.h
View File

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