From 0287f19b3eabf6b6632d51c0288e6cf0be2c5e69 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周三, 06 12月 2023 18:04:31 +0800
Subject: [PATCH] update pointer usage
---
src/core/contexts/abstractwindowcontext_p.h | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 996a0e3..127b33d 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -16,24 +16,24 @@
class QWK_CORE_EXPORT AbstractWindowContext : public QObject {
Q_OBJECT
public:
- AbstractWindowContext(QObject *host, WindowItemDelegate *delegate);
+ AbstractWindowContext(const QObject *host, const WindowItemDelegate *delegate);
~AbstractWindowContext() override;
public:
virtual bool setup() = 0;
- inline QObject *host() const;
+ inline const QObject *host() const;
inline QWindow *window() const;
- inline bool isHitTestVisible(QObject *obj) const;
- bool setHitTestVisible(QObject *obj, bool visible);
+ inline bool isHitTestVisible(const QObject *obj) const;
+ bool setHitTestVisible(const QObject *obj, bool visible);
bool setHitTestVisible(const QRect &rect, bool visible);
- inline QObject *systemButton(CoreWindowAgent::SystemButton button) const;
- bool setSystemButton(CoreWindowAgent::SystemButton button, QObject *obj);
+ inline const QObject *systemButton(CoreWindowAgent::SystemButton button) const;
+ bool setSystemButton(CoreWindowAgent::SystemButton button, const QObject *obj);
- inline QObject *titleBar() const;
- bool setTitleBar(QObject *obj);
+ inline const QObject *titleBar() const;
+ bool setTitleBar(const QObject *obj);
void showSystemMenu(const QPoint &pos);
@@ -42,22 +42,22 @@
bool isInTitleBarDraggableArea(const QPoint &pos) const;
protected:
- QObject *m_host;
- std::unique_ptr<WindowItemDelegate> m_delegate;
+ const QObject *m_host;
+ const WindowItemDelegate *m_delegate;
QWindow *m_windowHandle;
- QSet<QObject *> m_hitTestVisibleItems;
+ QSet<const QObject *> m_hitTestVisibleItems;
QList<QRect> m_hitTestVisibleRects;
- QObject *m_titleBar{};
- std::array<QObject *, CoreWindowAgent::NumSystemButton> m_systemButtons{};
+ const QObject *m_titleBar{};
+ std::array<const QObject *, CoreWindowAgent::NumSystemButton> m_systemButtons{};
// Cached shape
mutable bool hitTestVisibleShapeDirty{};
mutable QRegion hitTestVisibleShape;
};
- inline QObject *AbstractWindowContext::host() const {
+ inline const QObject *AbstractWindowContext::host() const {
return m_host;
}
@@ -65,16 +65,16 @@
return m_windowHandle;
}
- inline bool AbstractWindowContext::isHitTestVisible(QObject *obj) const {
+ inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
return m_hitTestVisibleItems.contains(obj);
}
- inline QObject *
+ inline const QObject *
AbstractWindowContext::systemButton(CoreWindowAgent::SystemButton button) const {
return m_systemButtons[button];
}
- inline QObject *AbstractWindowContext::titleBar() const {
+ inline const QObject *AbstractWindowContext::titleBar() const {
return m_titleBar;
}
--
Gitblit v1.9.1