From 8521bbf2f335984542f2071825d7383548862b7a Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周三, 06 12月 2023 10:46:55 +0800
Subject: [PATCH] minor tweaks
---
examples/shared/widgetframe/windowbar_p.h | 1 +
examples/shared/widgetframe/windowbar.h | 2 +-
examples/mainwindow/mainwindow.cpp | 3 +--
src/quick/quickitemdelegate.cpp | 4 ----
src/core/contexts/win32windowcontext.cpp | 3 ++-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 7246fdd..ae7cd16 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -32,8 +32,7 @@
void MainWindow::installWindowAgent() {
auto agent = new QWK::WidgetWindowAgent(this);
if (!agent->setup(this)) {
- qDebug() << "Frameless handle failed to initialize.";
- return;
+ qFatal("Frameless handle failed to initialize.");
}
auto titleLabel = new QLabel();
diff --git a/examples/shared/widgetframe/windowbar.h b/examples/shared/widgetframe/windowbar.h
index e8ea69b..2a8fe01 100644
--- a/examples/shared/widgetframe/windowbar.h
+++ b/examples/shared/widgetframe/windowbar.h
@@ -62,7 +62,7 @@
protected:
WindowBar(WindowBarPrivate &d, QWidget *parent = nullptr);
- QScopedPointer<WindowBarPrivate> d_ptr;
+ const std::unique_ptr<WindowBarPrivate> d_ptr;
};
}
diff --git a/examples/shared/widgetframe/windowbar_p.h b/examples/shared/widgetframe/windowbar_p.h
index cea8a99..3c16e5d 100644
--- a/examples/shared/widgetframe/windowbar_p.h
+++ b/examples/shared/widgetframe/windowbar_p.h
@@ -9,6 +9,7 @@
class WindowBarPrivate {
Q_DECLARE_PUBLIC(WindowBar)
+ Q_DISABLE_COPY(WindowBarPrivate)
public:
WindowBarPrivate();
virtual ~WindowBarPrivate();
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 4af7626..2f16af9 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -1329,6 +1329,7 @@
return true;
}
*result = HTCLIENT;
+ return true;
} else {
if (full) {
*result = HTCLIENT;
@@ -1390,8 +1391,8 @@
return true;
}
*result = HTCLIENT;
+ return true;
}
- return true;
}
default:
break;
diff --git a/src/quick/quickitemdelegate.cpp b/src/quick/quickitemdelegate.cpp
index 6bf6097..7696a4a 100644
--- a/src/quick/quickitemdelegate.cpp
+++ b/src/quick/quickitemdelegate.cpp
@@ -25,11 +25,7 @@
QRect QuickItemDelegate::mapGeometryToScene(const QObject *obj) const {
auto item = static_cast<const QQuickItem *>(obj);
const QPointF originPoint = item->mapToScene(QPointF(0.0, 0.0));
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
const QSizeF size = item->size();
-#else
- const QSizeF size = {item->width(), item->height()};
-#endif
return QRectF(originPoint, size).toRect();
}
--
Gitblit v1.9.1