From e20d8ebf6eb5a5a9fafc2eaf3b04d934e5089766 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 13 12月 2023 05:39:23 +0800
Subject: [PATCH] minor tweaks
---
src/widgets/widgetitemdelegate.cpp | 18 +++++++++---------
src/widgets/widgetitemdelegate_p.h | 4 ++--
src/core/contexts/win32windowcontext_p.h | 2 +-
src/core/windowitemdelegate_p.h | 4 ++--
src/quick/quickitemdelegate_p.h | 4 ++--
src/quick/quickitemdelegate.cpp | 6 +++---
src/core/contexts/qtwindowcontext_p.h | 2 +-
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/core/contexts/qtwindowcontext_p.h b/src/core/contexts/qtwindowcontext_p.h
index 6c264d2..8b70610 100644
--- a/src/core/contexts/qtwindowcontext_p.h
+++ b/src/core/contexts/qtwindowcontext_p.h
@@ -5,7 +5,7 @@
namespace QWK {
- class QWK_CORE_EXPORT QtWindowContext : public AbstractWindowContext {
+ class QtWindowContext : public AbstractWindowContext {
Q_OBJECT
public:
QtWindowContext();
diff --git a/src/core/contexts/win32windowcontext_p.h b/src/core/contexts/win32windowcontext_p.h
index eb03cad..ce51265 100644
--- a/src/core/contexts/win32windowcontext_p.h
+++ b/src/core/contexts/win32windowcontext_p.h
@@ -6,7 +6,7 @@
namespace QWK {
- class QWK_CORE_EXPORT Win32WindowContext : public AbstractWindowContext {
+ class Win32WindowContext : public AbstractWindowContext {
Q_OBJECT
Q_PROPERTY(bool needBorderPainter READ needBorderPainter FINAL)
Q_PROPERTY(int borderThickness READ borderThickness FINAL)
diff --git a/src/core/windowitemdelegate_p.h b/src/core/windowitemdelegate_p.h
index 584e3ff..da18578 100644
--- a/src/core/windowitemdelegate_p.h
+++ b/src/core/windowitemdelegate_p.h
@@ -16,13 +16,13 @@
public:
// Item property query
- virtual QWindow *window(const QObject *obj) const = 0;
+ virtual QWindow *window(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(const QObject *host) const = 0;
+ virtual QWindow *hostWindow(QObject *host) const = 0;
virtual bool isHostSizeFixed(const QObject *host) const = 0;
virtual bool isWindowActive(const QObject *host) const = 0;
diff --git a/src/quick/quickitemdelegate.cpp b/src/quick/quickitemdelegate.cpp
index 4c9b565..7bd1259 100644
--- a/src/quick/quickitemdelegate.cpp
+++ b/src/quick/quickitemdelegate.cpp
@@ -10,7 +10,7 @@
QuickItemDelegate::~QuickItemDelegate() = default;
- QWindow *QuickItemDelegate::window(const QObject *obj) const {
+ QWindow *QuickItemDelegate::window(QObject *obj) const {
return static_cast<const QQuickItem *>(obj)->window();
}
@@ -29,8 +29,8 @@
return QRectF(originPoint, size).toRect();
}
- QWindow *QuickItemDelegate::hostWindow(const QObject *host) const {
- return static_cast<QQuickWindow *>(const_cast<QObject *>(host));
+ QWindow *QuickItemDelegate::hostWindow(QObject *host) const {
+ return static_cast<QQuickWindow *>(host);
}
bool QuickItemDelegate::isHostSizeFixed(const QObject *host) const {
diff --git a/src/quick/quickitemdelegate_p.h b/src/quick/quickitemdelegate_p.h
index 6a8bd0d..31056d0 100644
--- a/src/quick/quickitemdelegate_p.h
+++ b/src/quick/quickitemdelegate_p.h
@@ -15,12 +15,12 @@
~QuickItemDelegate() override;
public:
- QWindow *window(const QObject *obj) const override;
+ QWindow *window(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(const QObject *host) const override;
+ QWindow *hostWindow(QObject *host) const override;
bool isHostSizeFixed(const QObject *host) const override;
bool isWindowActive(const QObject *host) const override;
};
diff --git a/src/widgets/widgetitemdelegate.cpp b/src/widgets/widgetitemdelegate.cpp
index 4814653..ca8bb99 100644
--- a/src/widgets/widgetitemdelegate.cpp
+++ b/src/widgets/widgetitemdelegate.cpp
@@ -12,7 +12,7 @@
WidgetItemDelegate::~WidgetItemDelegate() = default;
- QWindow *WidgetItemDelegate::window(const QObject *obj) const {
+ QWindow *WidgetItemDelegate::window(QObject *obj) const {
return static_cast<const QWidget *>(obj)->windowHandle();
}
@@ -31,7 +31,7 @@
return {originPoint, size};
}
- QWindow *WidgetItemDelegate::hostWindow(const QObject *host) const {
+ QWindow *WidgetItemDelegate::hostWindow(QObject *host) const {
return static_cast<const QWidget *>(host)->windowHandle();
}
@@ -49,8 +49,8 @@
}
// Usually set by the user.
const QSizePolicy sizePolicy = widget->sizePolicy();
- if ((sizePolicy.horizontalPolicy() == QSizePolicy::Fixed)
- && (sizePolicy.verticalPolicy() == QSizePolicy::Fixed)) {
+ if ((sizePolicy.horizontalPolicy() == QSizePolicy::Fixed) &&
+ (sizePolicy.verticalPolicy() == QSizePolicy::Fixed)) {
return true;
}
return false;
@@ -64,11 +64,11 @@
if (!qt_button_down) {
return;
}
- static constexpr const auto invalidPos = QPoint{std::numeric_limits<int>::lowest(), std::numeric_limits<int>::lowest()};
- const auto event =
- new QMouseEvent(QEvent::MouseButtonRelease, invalidPos, invalidPos, invalidPos,
- Qt::LeftButton, QGuiApplication::mouseButtons() ^ Qt::LeftButton,
- QGuiApplication::keyboardModifiers());
+ static constexpr const auto invalidPos =
+ QPoint{std::numeric_limits<int>::lowest(), std::numeric_limits<int>::lowest()};
+ const auto event = new QMouseEvent(
+ QEvent::MouseButtonRelease, invalidPos, invalidPos, invalidPos, Qt::LeftButton,
+ QGuiApplication::mouseButtons() ^ Qt::LeftButton, QGuiApplication::keyboardModifiers());
QApplication::postEvent(qt_button_down, event);
qt_button_down = nullptr;
}
diff --git a/src/widgets/widgetitemdelegate_p.h b/src/widgets/widgetitemdelegate_p.h
index 2b26b87..3ba34af 100644
--- a/src/widgets/widgetitemdelegate_p.h
+++ b/src/widgets/widgetitemdelegate_p.h
@@ -15,12 +15,12 @@
~WidgetItemDelegate() override;
public:
- QWindow *window(const QObject *obj) const override;
+ QWindow *window(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(const QObject *host) const override;
+ QWindow *hostWindow(QObject *host) const override;
bool isHostSizeFixed(const QObject *host) const override;
bool isWindowActive(const QObject *host) const override;
--
Gitblit v1.9.1