yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't rely on implicit QWeakPointer casting

Browse source 
Needs to be explicit with Qt6.
This commit is contained in:
Volker Krause 2022-03-12 12:57:48 +01:00
parent fad658200f
commit 7455507d07
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/tabbox/tabbox.cpp
View file

@ -110,7 +110,7 @@ QWeakPointer<TabBoxClient> TabBoxHandlerImpl::nextClientFocusChain(TabBoxClient*
if (TabBoxClientImpl* c = static_cast< TabBoxClientImpl* >(client)) { if (TabBoxClientImpl* c = static_cast< TabBoxClientImpl* >(client)) {
auto next = FocusChain::self()->nextMostRecentlyUsed(c->client()); auto next = FocusChain::self()->nextMostRecentlyUsed(c->client());
if (next) if (next)
return next->tabBoxClient(); return qWeakPointerCast<TabBoxClient, TabBoxClientImpl>(next->tabBoxClient());
} }
return QWeakPointer<TabBoxClient>(); return QWeakPointer<TabBoxClient>();
} }
@ -118,7 +118,7 @@ QWeakPointer<TabBoxClient> TabBoxHandlerImpl::nextClientFocusChain(TabBoxClient*
QWeakPointer< TabBoxClient > TabBoxHandlerImpl::firstClientFocusChain() const QWeakPointer< TabBoxClient > TabBoxHandlerImpl::firstClientFocusChain() const
{ {
if (auto c = FocusChain::self()->firstMostRecentlyUsed()) { if (auto c = FocusChain::self()->firstMostRecentlyUsed()) {
return QWeakPointer<TabBoxClient>(c->tabBoxClient()); return qWeakPointerCast<TabBoxClient, TabBoxClientImpl>(c->tabBoxClient());
} else { } else {
return QWeakPointer<TabBoxClient>(); return QWeakPointer<TabBoxClient>();
} }
@ -145,7 +145,7 @@ int TabBoxHandlerImpl::numberOfDesktops() const
QWeakPointer<TabBoxClient> TabBoxHandlerImpl::activeClient() const QWeakPointer<TabBoxClient> TabBoxHandlerImpl::activeClient() const
{ {
if (Workspace::self()->activeClient()) if (Workspace::self()->activeClient())
return Workspace::self()->activeClient()->tabBoxClient(); return qWeakPointerCast<TabBoxClient, TabBoxClientImpl>(Workspace::self()->activeClient()->tabBoxClient());
else else
return QWeakPointer<TabBoxClient>(); return QWeakPointer<TabBoxClient>();
} }
@ -261,14 +261,14 @@ QWeakPointer<TabBoxClient> TabBoxHandlerImpl::clientToAddToList(TabBoxClient* cl
AbstractClient* modal = current->findModal(); AbstractClient* modal = current->findModal();
if (modal == nullptr || modal == current) if (modal == nullptr || modal == current)
ret = current; ret = current;
else if (!clientList().contains(modal->tabBoxClient())) else if (!clientList().contains(qWeakPointerCast<TabBoxClient, TabBoxClientImpl>(modal->tabBoxClient())))
ret = modal; ret = modal;
else { else {
// nothing // nothing
} }
} }
if (ret) if (ret)
return ret->tabBoxClient(); return qWeakPointerCast<TabBoxClient, TabBoxClientImpl>(ret->tabBoxClient());
else else
return QWeakPointer<TabBoxClient>(); return QWeakPointer<TabBoxClient>();
} }
@ -279,7 +279,7 @@ TabBoxClientList TabBoxHandlerImpl::stackingOrder() const
TabBoxClientList ret; TabBoxClientList ret;
for (Toplevel *toplevel : stacking) { for (Toplevel *toplevel : stacking) {
if (auto client = qobject_cast<AbstractClient*>(toplevel)) { if (auto client = qobject_cast<AbstractClient*>(toplevel)) {
ret.append(client->tabBoxClient()); ret.append(qWeakPointerCast<TabBoxClient, TabBoxClientImpl>(client->tabBoxClient()));
} }
} }
return ret; return ret;
@ -325,7 +325,7 @@ QWeakPointer<TabBoxClient> TabBoxHandlerImpl::desktopClient() const
for (Toplevel *toplevel : stackingOrder) { for (Toplevel *toplevel : stackingOrder) {
auto client = qobject_cast<AbstractClient*>(toplevel); auto client = qobject_cast<AbstractClient*>(toplevel);
if (client && client->isDesktop() && client->isOnCurrentDesktop() && client->output() == workspace()->activeOutput()) { if (client && client->isDesktop() && client->isOnCurrentDesktop() && client->output() == workspace()->activeOutput()) {
return client->tabBoxClient(); return qWeakPointerCast<TabBoxClient, TabBoxClientImpl>(client->tabBoxClient());
} }
} }
return QWeakPointer<TabBoxClient>(); return QWeakPointer<TabBoxClient>();
@ -678,7 +678,7 @@ QList< int > TabBox::currentDesktopList()
void TabBox::setCurrentClient(AbstractClient *newClient) void TabBox::setCurrentClient(AbstractClient *newClient)
{ {
setCurrentIndex(m_tabBox->index(newClient->tabBoxClient())); setCurrentIndex(m_tabBox->index(qWeakPointerCast<TabBoxClient, TabBoxClientImpl>(newClient->tabBoxClient())));
} }
void TabBox::setCurrentDesktop(int newDesktop) void TabBox::setCurrentDesktop(int newDesktop)