diff --git a/src/plugins/platforms/wasm/qwasmdrag.cpp b/src/plugins/platforms/wasm/qwasmdrag.cpp index 6deb9e02568..52c2ddb14e2 100644 --- a/src/plugins/platforms/wasm/qwasmdrag.cpp +++ b/src/plugins/platforms/wasm/qwasmdrag.cpp @@ -25,23 +25,23 @@ using namespace emscripten; static void getTextPlainCallback(val m_string) { - QWasmDrag *thisDrag = static_cast(QWasmIntegration::get()->drag()); + QWasmDrag *thisDrag = static_cast(QWasmIntegration::get()->drag()); thisDrag->m_mimeData->setText(QString::fromStdString(m_string.as())); thisDrag->qWasmDrop(); } static void getTextUrlCallback(val m_string) { - QWasmDrag *thisDrag = static_cast(QWasmIntegration::get()->drag()); + QWasmDrag *thisDrag = static_cast(QWasmIntegration::get()->drag()); thisDrag->m_mimeData->setData(QStringLiteral("text/uri-list"), - QByteArray::fromStdString(m_string.as())); + QByteArray::fromStdString(m_string.as())); thisDrag->qWasmDrop(); } static void getTextHtmlCallback(val m_string) { - QWasmDrag *thisDrag = static_cast(QWasmIntegration::get()->drag()); + QWasmDrag *thisDrag = static_cast(QWasmIntegration::get()->drag()); thisDrag->m_mimeData->setHtml(QString::fromStdString(m_string.as())); thisDrag->qWasmDrop(); @@ -55,10 +55,10 @@ static void dropEvent(val event) // after the drop event // data-context thing was not working here :( - QWasmDrag *wasmDrag = static_cast(QWasmIntegration::get()->drag()); + QWasmDrag *wasmDrag = static_cast(QWasmIntegration::get()->drag()); wasmDrag->m_wasmScreen = - reinterpret_cast(event["target"]["data-qtdropcontext"].as()); + reinterpret_cast(event["target"]["data-qtdropcontext"].as()); wasmDrag->m_mouseDropPoint = QPoint(event["x"].as(), event["y"].as()); wasmDrag->m_mimeData = std::make_unique(); @@ -78,11 +78,11 @@ static void dropEvent(val event) wasmDrag->m_dropActions = Qt::IgnoreAction; if (dEffect == "copy") - wasmDrag->m_dropActions = Qt::CopyAction; + wasmDrag->m_dropActions = Qt::CopyAction; if (dEffect == "move") - wasmDrag->m_dropActions = Qt::MoveAction; + wasmDrag->m_dropActions = Qt::MoveAction; if (dEffect == "link") - wasmDrag->m_dropActions = Qt::LinkAction; + wasmDrag->m_dropActions = Qt::LinkAction; val dt = event["dataTransfer"]["items"]["length"]; @@ -92,7 +92,7 @@ static void dropEvent(val event) int count = dt.as(); wasmDrag->m_mimeTypesCount = count; // kind is file type: file or string - for (int i=0; i < count; i++) { + for (int i = 0; i < count; i++) { val item = event["dataTransfer"]["items"][i]; val kind = item["kind"]; val fileType = item["type"]; @@ -126,7 +126,7 @@ static void dropEvent(val event) } else { // string if (fileType.as() == "text/uri-list" - || fileType.as() == "text/x-moz-url") { + || fileType.as() == "text/x-moz-url") { item.call("getAsString", val::module_property("qtgetTextUrl")); } else if (fileType.as() == "text/html") { item.call("getAsString", val::module_property("qtgetTextHtml")); @@ -137,14 +137,14 @@ static void dropEvent(val event) } } -EMSCRIPTEN_BINDINGS(drop_module) { +EMSCRIPTEN_BINDINGS(drop_module) +{ function("qtDrop", &dropEvent); function("qtgetTextPlain", &getTextPlainCallback); function("qtgetTextUrl", &getTextUrlCallback); function("qtgetTextHtml", &getTextHtmlCallback); } - QWasmDrag::QWasmDrag() { init(); @@ -152,9 +152,7 @@ QWasmDrag::QWasmDrag() QWasmDrag::~QWasmDrag() = default; -void QWasmDrag::init() -{ -} +void QWasmDrag::init() { } void QWasmDrag::drop(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods) { @@ -169,32 +167,27 @@ void QWasmDrag::move(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardMo void QWasmDrag::qWasmDrop() { // collect mime - QWasmDrag *thisDrag = static_cast(QWasmIntegration::get()->drag()); + QWasmDrag *thisDrag = static_cast(QWasmIntegration::get()->drag()); if (thisDrag->m_mimeTypesCount != thisDrag->m_mimeData->formats().size()) return; // keep collecting mimetypes // start drag enter - QWindowSystemInterface::handleDrag(thisDrag->m_wasmScreen->topLevelAt(thisDrag->m_mouseDropPoint), - thisDrag->m_mimeData.get(), - thisDrag->m_mouseDropPoint, - thisDrag->m_dropActions, - thisDrag->m_qButton, - thisDrag->m_keyModifiers); + QWindowSystemInterface::handleDrag( + thisDrag->m_wasmScreen->topLevelAt(thisDrag->m_mouseDropPoint), + thisDrag->m_mimeData.get(), thisDrag->m_mouseDropPoint, thisDrag->m_dropActions, + thisDrag->m_qButton, thisDrag->m_keyModifiers); // drag drop - QWindowSystemInterface::handleDrop(thisDrag->m_wasmScreen->topLevelAt(thisDrag->m_mouseDropPoint), - thisDrag->m_mimeData.get(), - thisDrag->m_mouseDropPoint, - thisDrag->m_dropActions, - thisDrag->m_qButton, - thisDrag->m_keyModifiers); + QWindowSystemInterface::handleDrop( + thisDrag->m_wasmScreen->topLevelAt(thisDrag->m_mouseDropPoint), + thisDrag->m_mimeData.get(), thisDrag->m_mouseDropPoint, thisDrag->m_dropActions, + thisDrag->m_qButton, thisDrag->m_keyModifiers); // drag leave - QWindowSystemInterface::handleDrag(thisDrag->m_wasmScreen->topLevelAt(thisDrag->m_mouseDropPoint), - nullptr, - QPoint(), - Qt::IgnoreAction, { }, { }); + QWindowSystemInterface::handleDrag( + thisDrag->m_wasmScreen->topLevelAt(thisDrag->m_mouseDropPoint), nullptr, QPoint(), + Qt::IgnoreAction, {}, {}); thisDrag->m_mimeData->clear(); thisDrag->m_mimeTypesCount = 0; diff --git a/src/plugins/platforms/wasm/qwasmdrag.h b/src/plugins/platforms/wasm/qwasmdrag.h index 3da8b308635..b13c663e3c2 100644 --- a/src/plugins/platforms/wasm/qwasmdrag.h +++ b/src/plugins/platforms/wasm/qwasmdrag.h @@ -17,7 +17,6 @@ QT_BEGIN_NAMESPACE class QWasmDrag : public QSimpleDrag { public: - QWasmDrag(); ~QWasmDrag(); @@ -37,7 +36,6 @@ private: void init(); }; - QT_END_NAMESPACE #endif // QWASMDRAG_H