summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorMikolaj Boc <[email protected]>2022-10-19 14:12:06 +0200
committerMikolaj Boc <[email protected]>2022-10-20 16:36:23 +0200
commitfffea48ea57fc71993a43d7658c1e49d14234b87 (patch)
tree5b898ef323ea6b981f29de0c62851609face7e67 /src/plugins/platforms
parentcdd7163c6071ac2020a1750cf2820ecea057abe4 (diff)
Fix typo in QWasmWindowStack's name
'Wasm' in it is duplicated. Change-Id: Ie00e02fb7ae4d9e13f490ce2d46a4eabf3f5710c Reviewed-by: Lorn Potter <[email protected]>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/wasm/qwasmcompositor.h2
-rw-r--r--src/plugins/platforms/wasm/qwasmwindowstack.cpp34
-rw-r--r--src/plugins/platforms/wasm/qwasmwindowstack.h6
3 files changed, 21 insertions, 21 deletions
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.h b/src/plugins/platforms/wasm/qwasmcompositor.h
index 7342fd073b7..225bf90fe4d 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.h
+++ b/src/plugins/platforms/wasm/qwasmcompositor.h
@@ -162,7 +162,7 @@ private:
void leaveWindow(QWindow *window);
WindowManipulation m_windowManipulation;
- QWasmWasmWindowStack m_windowStack;
+ QWasmWindowStack m_windowStack;
QScopedPointer<QOpenGLContext> m_context;
QScopedPointer<QOpenGLTextureBlitter> m_blitter;
diff --git a/src/plugins/platforms/wasm/qwasmwindowstack.cpp b/src/plugins/platforms/wasm/qwasmwindowstack.cpp
index c73ecde9fbe..098f1c1ff20 100644
--- a/src/plugins/platforms/wasm/qwasmwindowstack.cpp
+++ b/src/plugins/platforms/wasm/qwasmwindowstack.cpp
@@ -5,14 +5,14 @@
QT_BEGIN_NAMESPACE
-QWasmWasmWindowStack::QWasmWasmWindowStack(TopWindowChangedCallbackType topWindowChangedCallback)
+QWasmWindowStack::QWasmWindowStack(TopWindowChangedCallbackType topWindowChangedCallback)
: m_topWindowChangedCallback(std::move(topWindowChangedCallback))
{
}
-QWasmWasmWindowStack::~QWasmWasmWindowStack() = default;
+QWasmWindowStack::~QWasmWindowStack() = default;
-void QWasmWasmWindowStack::pushWindow(QWasmWindow *window)
+void QWasmWindowStack::pushWindow(QWasmWindow *window)
{
Q_ASSERT(m_windowStack.count(window) == 0);
@@ -21,7 +21,7 @@ void QWasmWasmWindowStack::pushWindow(QWasmWindow *window)
m_topWindowChangedCallback();
}
-void QWasmWasmWindowStack::removeWindow(QWasmWindow *window)
+void QWasmWindowStack::removeWindow(QWasmWindow *window)
{
Q_ASSERT(m_windowStack.count(window) == 1);
@@ -37,7 +37,7 @@ void QWasmWasmWindowStack::removeWindow(QWasmWindow *window)
m_topWindowChangedCallback();
}
-void QWasmWasmWindowStack::raise(QWasmWindow *window)
+void QWasmWindowStack::raise(QWasmWindow *window)
{
Q_ASSERT(m_windowStack.count(window) == 1);
@@ -49,7 +49,7 @@ void QWasmWasmWindowStack::raise(QWasmWindow *window)
m_topWindowChangedCallback();
}
-void QWasmWasmWindowStack::lower(QWasmWindow *window)
+void QWasmWindowStack::lower(QWasmWindow *window)
{
Q_ASSERT(m_windowStack.count(window) == 1);
@@ -63,58 +63,58 @@ void QWasmWasmWindowStack::lower(QWasmWindow *window)
m_topWindowChangedCallback();
}
-QWasmWasmWindowStack::iterator QWasmWasmWindowStack::begin()
+QWasmWindowStack::iterator QWasmWindowStack::begin()
{
return m_windowStack.rbegin();
}
-QWasmWasmWindowStack::iterator QWasmWasmWindowStack::end()
+QWasmWindowStack::iterator QWasmWindowStack::end()
{
return m_windowStack.rend();
}
-QWasmWasmWindowStack::const_iterator QWasmWasmWindowStack::begin() const
+QWasmWindowStack::const_iterator QWasmWindowStack::begin() const
{
return m_windowStack.rbegin();
}
-QWasmWasmWindowStack::const_iterator QWasmWasmWindowStack::end() const
+QWasmWindowStack::const_iterator QWasmWindowStack::end() const
{
return m_windowStack.rend();
}
-QWasmWasmWindowStack::const_reverse_iterator QWasmWasmWindowStack::rbegin() const
+QWasmWindowStack::const_reverse_iterator QWasmWindowStack::rbegin() const
{
return m_windowStack.begin();
}
-QWasmWasmWindowStack::const_reverse_iterator QWasmWasmWindowStack::rend() const
+QWasmWindowStack::const_reverse_iterator QWasmWindowStack::rend() const
{
return m_windowStack.end();
}
-bool QWasmWasmWindowStack::empty() const
+bool QWasmWindowStack::empty() const
{
return m_windowStack.empty();
}
-size_t QWasmWasmWindowStack::size() const
+size_t QWasmWindowStack::size() const
{
return m_windowStack.size();
}
-QWasmWindow *QWasmWasmWindowStack::rootWindow() const
+QWasmWindow *QWasmWindowStack::rootWindow() const
{
return m_firstWindowTreatment == FirstWindowTreatment::AlwaysAtBottom ? m_windowStack.first()
: nullptr;
}
-QWasmWindow *QWasmWasmWindowStack::topWindow() const
+QWasmWindow *QWasmWindowStack::topWindow() const
{
return m_windowStack.empty() ? nullptr : m_windowStack.last();
}
-QWasmWasmWindowStack::StorageType::iterator QWasmWasmWindowStack::regularWindowsBegin()
+QWasmWindowStack::StorageType::iterator QWasmWindowStack::regularWindowsBegin()
{
return m_windowStack.begin()
+ (m_firstWindowTreatment == FirstWindowTreatment::AlwaysAtBottom ? 1 : 0);
diff --git a/src/plugins/platforms/wasm/qwasmwindowstack.h b/src/plugins/platforms/wasm/qwasmwindowstack.h
index 4193089056e..e98ebf904c2 100644
--- a/src/plugins/platforms/wasm/qwasmwindowstack.h
+++ b/src/plugins/platforms/wasm/qwasmwindowstack.h
@@ -21,7 +21,7 @@ class QWasmWindow;
// Access to the top element is facilitated by |topWindow|.
// Changes to the top element are signaled via the |topWindowChangedCallback| supplied at
// construction.
-Q_AUTOTEST_EXPORT class QWasmWasmWindowStack
+Q_AUTOTEST_EXPORT class QWasmWindowStack
{
public:
using TopWindowChangedCallbackType = std::function<void()>;
@@ -32,8 +32,8 @@ public:
using const_iterator = StorageType::const_reverse_iterator;
using const_reverse_iterator = StorageType::const_iterator;
- explicit QWasmWasmWindowStack(TopWindowChangedCallbackType topWindowChangedCallback);
- ~QWasmWasmWindowStack();
+ explicit QWasmWindowStack(TopWindowChangedCallbackType topWindowChangedCallback);
+ ~QWasmWindowStack();
void pushWindow(QWasmWindow *window);
void removeWindow(QWasmWindow *window);