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

Rename the aboutToBeUnbound() signal in SurfaceInterface

Browse source 
Rename the aboutToBeUnbound() signal to aboutToBeDestroyed() in order to
make the usage of the word "destroyed" consistent.
This commit is contained in:
Vlad Zahorodnii 2020-07-16 16:18:56 +03:00 committed by Vlad Zahorodnii
parent c57270fa4a
commit 3994faff50
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wayland/keyboard_interface.cpp
View file

@ -130,7 +130,7 @@ void KeyboardInterface::setFocusedSurface(SurfaceInterface *surface, quint32 ser
if (!d->focusedSurface) {
return;
}
d->destroyConnection = connect(d->focusedSurface, &SurfaceInterface::aboutToBeUnbound, this,
d->destroyConnection = connect(d->focusedSurface, &SurfaceInterface::aboutToBeDestroyed, this,
[this] {
Q_D();
if (d->resource) {

2
src/wayland/pointer_interface.cpp
View file

@ -264,7 +264,7 @@ void PointerInterface::setFocusedSurface(SurfaceInterface *surface, quint32 seri
return;
}
d->focusedSurface = surface;
d->destroyConnection = connect(d->focusedSurface, &SurfaceInterface::aboutToBeUnbound, this,
d->destroyConnection = connect(d->focusedSurface, &SurfaceInterface::aboutToBeDestroyed, this,
[this] {
Q_D();
d->sendLeave(d->focusedChildSurface.data(), d->global->display()->nextSerial());

2
src/wayland/seat_interface.cpp
View file

@ -1616,7 +1616,7 @@ void SeatInterface::setFocusedTextInputSurface(SurfaceInterface *surface)
}
d->textInput.focus.textInput = t;
if (d->textInput.focus.surface) {
d->textInput.focus.destroyConnection = connect(surface, &SurfaceInterface::aboutToBeUnbound, this,
d->textInput.focus.destroyConnection = connect(surface, &SurfaceInterface::aboutToBeDestroyed, this,
[this] {
setFocusedTextInputSurface(nullptr);
}

2
src/wayland/surface_interface.cpp
View file

@ -284,7 +284,7 @@ void SurfaceInterfacePrivate::installIdleInhibitor(IdleInhibitorInterface *inhib
void SurfaceInterfacePrivate::surface_destroy_resource(Resource *)
{
emit q->aboutToBeUnbound();
emit q->aboutToBeDestroyed();
delete q;
}

10
src/wayland/surface_interface.h
View file

@ -368,9 +368,15 @@ public:
Q_SIGNALS:
/**
* This signal is emitted when the surface is about to be unbound.
* This signal is emitted when the underlying wl_surface resource is about to be freed.
*
* The unbound() signal is emitted either when the client that owns the surface has been
* destroyed or if the surface has been destroyed due to a destructor request.
*
* The SurfaceInterface object and the associated wl_surface resource are valid when this
* signal is emitted.
*/
void aboutToBeUnbound();
void aboutToBeDestroyed();
/**
* This signal is emitted when the projection matrix from the surface-local coordinate space
* to the buffer coordinate space has been changed.