From 64e40913df1fac22e297998b394b76cce08538ae Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 19 Oct 2021 18:50:26 +0400 Subject: [PATCH] Use new Qt 6 adapters --- ui/platform/linux/ui_utility_linux.cpp | 3 +-- ui/platform/mac/ui_utility_mac.mm | 1 - ui/text/text_entity.cpp | 3 +-- ui/widgets/input_fields.cpp | 9 +++++---- ui/widgets/labels.cpp | 3 ++- ui/widgets/popup_menu.cpp | 3 +-- ui/widgets/scroll_area.cpp | 5 +++-- ui/widgets/tooltip.cpp | 3 +-- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp index 65491de..2a7fb2d 100644 --- a/ui/platform/linux/ui_utility_linux.cpp +++ b/ui/platform/linux/ui_utility_linux.cpp @@ -10,7 +10,6 @@ #include "base/debug_log.h" #include "ui/platform/linux/ui_linux_wayland_integration.h" #include "base/const_string.h" -#include "base/qt_adapters.h" #include "base/flat_set.h" #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION @@ -434,7 +433,7 @@ bool TranslucentWindowsSupported(QPoint globalPosition) { if (::Platform::IsX11()) { if (const auto native = QGuiApplication::platformNativeInterface()) { - if (const auto screen = base::QScreenNearestTo(globalPosition)) { + if (const auto screen = QGuiApplication::screenAt(globalPosition)) { if (native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen)) { return true; } diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm index c1139d7..b230169 100644 --- a/ui/platform/mac/ui_utility_mac.mm +++ b/ui/platform/mac/ui_utility_mac.mm @@ -7,7 +7,6 @@ #include "ui/platform/mac/ui_utility_mac.h" #include "ui/integration.h" -#include "base/qt_adapters.h" #include #include diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp index 8dbbd7a..eaef0d1 100644 --- a/ui/text/text_entity.cpp +++ b/ui/text/text_entity.cpp @@ -9,7 +9,6 @@ #include "base/qthelp_url.h" #include "base/qthelp_regex.h" #include "base/crc32hash.h" -#include "base/qt_adapters.h" #include "ui/text/text.h" #include "ui/widgets/input_fields.h" #include "ui/emoji_config.h" @@ -1402,7 +1401,7 @@ QStringList PrepareSearchWords( auto list = clean.split(SplitterOverride ? *SplitterOverride : RegExpWordSplit(), - base::QStringSkipEmptyParts); + Qt::SkipEmptyParts); result.reserve(list.size()); for (const auto &word : std::as_const(list)) { auto trimmed = word.trimmed(); diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp index bfbf919..e6b698a 100644 --- a/ui/widgets/input_fields.cpp +++ b/ui/widgets/input_fields.cpp @@ -15,6 +15,7 @@ #include "base/platform/base_platform_info.h" #include "emoji_suggestions_helper.h" #include "styles/palette.h" +#include "base/qt_adapters.h" #include #include @@ -1011,7 +1012,7 @@ bool FlatInput::eventHook(QEvent *e) { || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { const auto ev = static_cast(e); - if (ev->device()->type() == QTouchDevice::TouchScreen) { + if (ev->device()->type() == base::TouchDevice::TouchScreen) { touchEvent(ev); } } @@ -1382,7 +1383,7 @@ bool InputField::viewportEventInner(QEvent *e) { || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { const auto ev = static_cast(e); - if (ev->device()->type() == QTouchDevice::TouchScreen) { + if (ev->device()->type() == base::TouchDevice::TouchScreen) { handleTouchEvent(ev); } } @@ -1590,7 +1591,7 @@ void InputField::insertTag(const QString &text, QString tagId) { cursor.insertText(text + ' ', _defaultCharFormat); } else { _insertedTags.clear(); - _insertedTags.push_back({ 0, text.size(), tagId }); + _insertedTags.push_back({ 0, int(text.size()), tagId }); _insertedTagsAreFromMime = false; cursor.insertText(text + ' '); _insertedTags.clear(); @@ -3819,7 +3820,7 @@ bool MaskedInputField::eventHook(QEvent *e) { || type == QEvent::TouchEnd || type == QEvent::TouchCancel) { auto event = static_cast(e); - if (event->device()->type() == QTouchDevice::TouchScreen) { + if (event->device()->type() == base::TouchDevice::TouchScreen) { touchEvent(event); } } diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp index b2c678a..1200bbf 100644 --- a/ui/widgets/labels.cpp +++ b/ui/widgets/labels.cpp @@ -13,6 +13,7 @@ #include "ui/widgets/box_content_divider.h" #include "ui/basic_click_handlers.h" // UrlClickHandler #include "ui/inactive_press.h" +#include "base/qt_adapters.h" #include #include @@ -546,7 +547,7 @@ void FlatLabel::contextMenuEvent(QContextMenuEvent *e) { bool FlatLabel::eventHook(QEvent *e) { if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { QTouchEvent *ev = static_cast(e); - if (ev->device()->type() == QTouchDevice::TouchScreen) { + if (ev->device()->type() == base::TouchDevice::TouchScreen) { touchEvent(ev); return true; } diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp index 6a7cc17..37faaaa 100644 --- a/ui/widgets/popup_menu.cpp +++ b/ui/widgets/popup_menu.cpp @@ -16,7 +16,6 @@ #include "ui/delayed_activation.h" #include "ui/painter.h" #include "base/platform/base_platform_info.h" -#include "base/qt_adapters.h" #include #include @@ -731,7 +730,7 @@ void PopupMenu::popup(const QPoint &p) { } void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource source) { - const auto screen = base::QScreenNearestTo(p); + const auto screen = QGuiApplication::screenAt(p); if (!screen || (!parent && ::Platform::IsMac() && !Platform::IsApplicationActive())) { _hiding = false; diff --git a/ui/widgets/scroll_area.cpp b/ui/widgets/scroll_area.cpp index 27691f0..b4b59e6 100644 --- a/ui/widgets/scroll_area.cpp +++ b/ui/widgets/scroll_area.cpp @@ -8,6 +8,7 @@ #include "ui/painter.h" #include "ui/ui_utility.h" +#include "base/qt_adapters.h" #include #include @@ -472,7 +473,7 @@ bool ScrollArea::eventFilter(QObject *obj, QEvent *e) { bool res = QScrollArea::eventFilter(obj, e); if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { QTouchEvent *ev = static_cast(e); - if (_touchEnabled && ev->device()->type() == QTouchDevice::TouchScreen) { + if (_touchEnabled && ev->device()->type() == base::TouchDevice::TouchScreen) { if (obj == widget()) { touchEvent(ev); return true; @@ -485,7 +486,7 @@ bool ScrollArea::eventFilter(QObject *obj, QEvent *e) { bool ScrollArea::viewportEvent(QEvent *e) { if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) { QTouchEvent *ev = static_cast(e); - if (_touchEnabled && ev->device()->type() == QTouchDevice::TouchScreen) { + if (_touchEnabled && ev->device()->type() == base::TouchDevice::TouchScreen) { touchEvent(ev); return true; } diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp index 0b8baf3..83c3ebd 100644 --- a/ui/widgets/tooltip.cpp +++ b/ui/widgets/tooltip.cpp @@ -9,7 +9,6 @@ #include "ui/ui_utility.h" #include "ui/platform/ui_platform_utility.h" #include "base/invoke_queued.h" -#include "base/qt_adapters.h" #include "styles/style_widgets.h" #include @@ -73,7 +72,7 @@ Tooltip::~Tooltip() { } void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *st) { - const auto screen = base::QScreenNearestTo(m); + const auto screen = QGuiApplication::screenAt(m); if (!screen) { Hide(); return;