1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo in QWasmWindowStack's name

Browse Source 
'Wasm' in it is duplicated.

Change-Id: Ie00e02fb7ae4d9e13f490ce2d46a4eabf3f5710c
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This commit is contained in:
Mikolaj Boc 2022-10-19 14:12:06 +02:00
parent cdd7163c60
commit fffea48ea5
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wasm/qwasmcompositor.h
View File

@ -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;

34
src/plugins/platforms/wasm/qwasmwindowstack.cpp
View File

@ -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);

6
src/plugins/platforms/wasm/qwasmwindowstack.h
View File

@ -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);

22
tests/auto/wasm/tst_qwasmwindowstack.cpp
View File

@ -11,7 +11,7 @@ class QWasmWindow
};
namespace {
std::vector<QWasmWindow *> getWindowsFrontToBack(const QWasmWasmWindowStack *stack)
std::vector<QWasmWindow *> getWindowsFrontToBack(const QWasmWindowStack *stack)
{
return std::vector<QWasmWindow *>(stack->begin(), stack->end());
}
@ -54,8 +54,8 @@ private:
void clearCallbackCounter() { m_topLevelChangedCallCount = 0; }
QWasmWasmWindowStack::TopWindowChangedCallbackType m_mockCallback;
QWasmWasmWindowStack::TopWindowChangedCallbackType m_onTopLevelChangedAction;
QWasmWindowStack::TopWindowChangedCallbackType m_mockCallback;
QWasmWindowStack::TopWindowChangedCallbackType m_onTopLevelChangedAction;
int m_topLevelChangedCallCount = 0;
QWasmWindow m_root;
@ -68,13 +68,13 @@ private:
void tst_QWasmWindowStack::init()
{
m_onTopLevelChangedAction = QWasmWasmWindowStack::TopWindowChangedCallbackType();
m_onTopLevelChangedAction = QWasmWindowStack::TopWindowChangedCallbackType();
clearCallbackCounter();
}
void tst_QWasmWindowStack::insertion()
{
QWasmWasmWindowStack stack(m_mockCallback);
QWasmWindowStack stack(m_mockCallback);
m_onTopLevelChangedAction = [this, &stack]() { QVERIFY(stack.topWindow() == &m_root); };
stack.pushWindow(&m_root);
@ -91,7 +91,7 @@ void tst_QWasmWindowStack::insertion()
void tst_QWasmWindowStack::raisingTheRootIsImpossible()
{
QWasmWasmWindowStack stack(m_mockCallback);
QWasmWindowStack stack(m_mockCallback);
stack.pushWindow(&m_root);
stack.pushWindow(&m_window1);
@ -114,7 +114,7 @@ void tst_QWasmWindowStack::raisingTheRootIsImpossible()
void tst_QWasmWindowStack::raising()
{
QWasmWasmWindowStack stack(m_mockCallback);
QWasmWindowStack stack(m_mockCallback);
stack.pushWindow(&m_root);
stack.pushWindow(&m_window1);
@ -144,7 +144,7 @@ void tst_QWasmWindowStack::raising()
void tst_QWasmWindowStack::lowering()
{
QWasmWasmWindowStack stack(m_mockCallback);
QWasmWindowStack stack(m_mockCallback);
stack.pushWindow(&m_root);
stack.pushWindow(&m_window1);
@ -175,7 +175,7 @@ void tst_QWasmWindowStack::lowering()
void tst_QWasmWindowStack::removing()
{
QWasmWasmWindowStack stack(m_mockCallback);
QWasmWindowStack stack(m_mockCallback);
stack.pushWindow(&m_root);
stack.pushWindow(&m_window1);
@ -206,7 +206,7 @@ void tst_QWasmWindowStack::removing()
void tst_QWasmWindowStack::removingTheRoot()
{
QWasmWasmWindowStack stack(m_mockCallback);
QWasmWindowStack stack(m_mockCallback);
stack.pushWindow(&m_root);
stack.pushWindow(&m_window1);
@ -244,7 +244,7 @@ void tst_QWasmWindowStack::removingTheRoot()
void tst_QWasmWindowStack::clearing()
{
QWasmWasmWindowStack stack(m_mockCallback);
QWasmWindowStack stack(m_mockCallback);
stack.pushWindow(&m_root);
stack.pushWindow(&m_window1);