From f041cd599f2ba58906958f6886b9cd25e180d0af Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周三, 06 12月 2023 10:28:34 +0800
Subject: [PATCH] add more const
---
src/core/windowitemdelegate.h | 10 +++++-----
src/widgets/widgetitemdelegate.cpp | 10 +++++-----
src/widgets/widgetitemdelegate_p.h | 10 +++++-----
src/quick/quickitemdelegate_p.h | 10 +++++-----
src/quick/quickitemdelegate.cpp | 19 ++++++++++---------
5 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/src/core/windowitemdelegate.h b/src/core/windowitemdelegate.h
index 498216d..7d7e6d1 100644
--- a/src/core/windowitemdelegate.h
+++ b/src/core/windowitemdelegate.h
@@ -16,14 +16,14 @@
public:
// Item property query
- virtual QWindow *window(QObject *obj) const = 0;
- virtual bool isEnabled(QObject *obj) const = 0;
- virtual bool isVisible(QObject *obj) const = 0;
+ virtual QWindow *window(const QObject *obj) const = 0;
+ virtual bool isEnabled(const QObject *obj) const = 0;
+ virtual bool isVisible(const QObject *obj) const = 0;
virtual QRect mapGeometryToScene(const QObject *obj) const = 0;
// Host property query
- virtual QWindow *hostWindow(QObject *host) const = 0;
- virtual bool isHostSizeFixed(QObject *host) const = 0;
+ virtual QWindow *hostWindow(const QObject *host) const = 0;
+ virtual bool isHostSizeFixed(const QObject *host) const = 0;
// Callbacks
virtual bool resetQtGrabbedControl() const;
diff --git a/src/quick/quickitemdelegate.cpp b/src/quick/quickitemdelegate.cpp
index aa85204..6bf6097 100644
--- a/src/quick/quickitemdelegate.cpp
+++ b/src/quick/quickitemdelegate.cpp
@@ -10,16 +10,16 @@
QuickItemDelegate::~QuickItemDelegate() = default;
- QWindow *QuickItemDelegate::window(QObject *obj) const {
- return static_cast<QQuickItem *>(obj)->window();
+ QWindow *QuickItemDelegate::window(const QObject *obj) const {
+ return static_cast<const QQuickItem *>(obj)->window();
}
- bool QuickItemDelegate::isEnabled(QObject *obj) const {
- return static_cast<QQuickItem *>(obj)->isEnabled();
+ bool QuickItemDelegate::isEnabled(const QObject *obj) const {
+ return static_cast<const QQuickItem *>(obj)->isEnabled();
}
- bool QuickItemDelegate::isVisible(QObject *obj) const {
- return static_cast<QQuickItem *>(obj)->isVisible();
+ bool QuickItemDelegate::isVisible(const QObject *obj) const {
+ return static_cast<const QQuickItem *>(obj)->isVisible();
}
QRect QuickItemDelegate::mapGeometryToScene(const QObject *obj) const {
@@ -33,11 +33,12 @@
return QRectF(originPoint, size).toRect();
}
- QWindow *QuickItemDelegate::hostWindow(QObject *host) const {
- return static_cast<QQuickWindow *>(host);
+ QWindow *QuickItemDelegate::hostWindow(const QObject *host) const {
+ return static_cast<QQuickWindow *>(const_cast<QObject *>(host));
}
- bool QuickItemDelegate::isHostSizeFixed(QObject *host) const {
+ bool QuickItemDelegate::isHostSizeFixed(const QObject *host) const {
+ // ### TOOD
return false;
}
diff --git a/src/quick/quickitemdelegate_p.h b/src/quick/quickitemdelegate_p.h
index b8bd84d..a63aa71 100644
--- a/src/quick/quickitemdelegate_p.h
+++ b/src/quick/quickitemdelegate_p.h
@@ -15,13 +15,13 @@
~QuickItemDelegate() override;
public:
- QWindow *window(QObject *obj) const override;
- bool isEnabled(QObject *obj) const override;
- bool isVisible(QObject *obj) const override;
+ QWindow *window(const QObject *obj) const override;
+ bool isEnabled(const QObject *obj) const override;
+ bool isVisible(const QObject *obj) const override;
QRect mapGeometryToScene(const QObject *obj) const override;
- QWindow * hostWindow(QObject *host) const override;
- bool isHostSizeFixed(QObject *host) const override;
+ QWindow * hostWindow(const QObject *host) const override;
+ bool isHostSizeFixed(const QObject *host) const override;
};
}
diff --git a/src/widgets/widgetitemdelegate.cpp b/src/widgets/widgetitemdelegate.cpp
index 974f755..6378f36 100644
--- a/src/widgets/widgetitemdelegate.cpp
+++ b/src/widgets/widgetitemdelegate.cpp
@@ -12,15 +12,15 @@
WidgetItemDelegate::~WidgetItemDelegate() = default;
- QWindow *WidgetItemDelegate::window(QObject *obj) const {
+ QWindow *WidgetItemDelegate::window(const QObject *obj) const {
return static_cast<const QWidget *>(obj)->windowHandle();
}
- bool WidgetItemDelegate::isEnabled(QObject *obj) const {
+ bool WidgetItemDelegate::isEnabled(const QObject *obj) const {
return static_cast<const QWidget *>(obj)->isEnabled();
}
- bool WidgetItemDelegate::isVisible(QObject *obj) const {
+ bool WidgetItemDelegate::isVisible(const QObject *obj) const {
return static_cast<const QWidget *>(obj)->isVisible();
}
@@ -31,11 +31,11 @@
return {originPoint, size};
}
- QWindow *WidgetItemDelegate::hostWindow(QObject *host) const {
+ QWindow *WidgetItemDelegate::hostWindow(const QObject *host) const {
return static_cast<const QWidget *>(host)->windowHandle();
}
- bool WidgetItemDelegate::isHostSizeFixed(QObject *host) const {
+ bool WidgetItemDelegate::isHostSizeFixed(const QObject *host) const {
const auto widget = static_cast<const QWidget *>(host);
// "Qt::MSWindowsFixedSizeDialogHint" is used cross-platform actually.
if (widget->windowFlags() & Qt::MSWindowsFixedSizeDialogHint) {
diff --git a/src/widgets/widgetitemdelegate_p.h b/src/widgets/widgetitemdelegate_p.h
index 11d60fd..e5264e9 100644
--- a/src/widgets/widgetitemdelegate_p.h
+++ b/src/widgets/widgetitemdelegate_p.h
@@ -15,13 +15,13 @@
~WidgetItemDelegate() override;
public:
- QWindow *window(QObject *obj) const override;
- bool isEnabled(QObject *obj) const override;
- bool isVisible(QObject *obj) const override;
+ QWindow *window(const QObject *obj) const override;
+ bool isEnabled(const QObject *obj) const override;
+ bool isVisible(const QObject *obj) const override;
QRect mapGeometryToScene(const QObject *obj) const override;
- QWindow * hostWindow(QObject *host) const override;
- bool isHostSizeFixed(QObject *host) const override;
+ QWindow * hostWindow(const QObject *host) const override;
+ bool isHostSizeFixed(const QObject *host) const override;
bool resetQtGrabbedControl() const override;
};
--
Gitblit v1.9.1