Commit 8351f51e authored by Vlad Zahorodnii's avatar Vlad Zahorodnii Committed by Vlad Zahorodnii
Browse files

Rename the aboutToBeUnbound() signal in SurfaceInterface

Rename the aboutToBeUnbound() signal to aboutToBeDestroyed() in order to
make the usage of the word "destroyed" consistent.
parent aea81039
...@@ -130,7 +130,7 @@ void KeyboardInterface::setFocusedSurface(SurfaceInterface *surface, quint32 ser ...@@ -130,7 +130,7 @@ void KeyboardInterface::setFocusedSurface(SurfaceInterface *surface, quint32 ser
if (!d->focusedSurface) { if (!d->focusedSurface) {
return; return;
} }
d->destroyConnection = connect(d->focusedSurface, &SurfaceInterface::aboutToBeUnbound, this, d->destroyConnection = connect(d->focusedSurface, &SurfaceInterface::aboutToBeDestroyed, this,
[this] { [this] {
Q_D(); Q_D();
if (d->resource) { if (d->resource) {
......
...@@ -264,7 +264,7 @@ void PointerInterface::setFocusedSurface(SurfaceInterface *surface, quint32 seri ...@@ -264,7 +264,7 @@ void PointerInterface::setFocusedSurface(SurfaceInterface *surface, quint32 seri
return; return;
} }
d->focusedSurface = surface; d->focusedSurface = surface;
d->destroyConnection = connect(d->focusedSurface, &SurfaceInterface::aboutToBeUnbound, this, d->destroyConnection = connect(d->focusedSurface, &SurfaceInterface::aboutToBeDestroyed, this,
[this] { [this] {
Q_D(); Q_D();
d->sendLeave(d->focusedChildSurface.data(), d->global->display()->nextSerial()); d->sendLeave(d->focusedChildSurface.data(), d->global->display()->nextSerial());
......
...@@ -1616,7 +1616,7 @@ void SeatInterface::setFocusedTextInputSurface(SurfaceInterface *surface) ...@@ -1616,7 +1616,7 @@ void SeatInterface::setFocusedTextInputSurface(SurfaceInterface *surface)
} }
d->textInput.focus.textInput = t; d->textInput.focus.textInput = t;
if (d->textInput.focus.surface) { if (d->textInput.focus.surface) {
d->textInput.focus.destroyConnection = connect(surface, &SurfaceInterface::aboutToBeUnbound, this, d->textInput.focus.destroyConnection = connect(surface, &SurfaceInterface::aboutToBeDestroyed, this,
[this] { [this] {
setFocusedTextInputSurface(nullptr); setFocusedTextInputSurface(nullptr);
} }
......
...@@ -284,7 +284,7 @@ void SurfaceInterfacePrivate::installIdleInhibitor(IdleInhibitorInterface *inhib ...@@ -284,7 +284,7 @@ void SurfaceInterfacePrivate::installIdleInhibitor(IdleInhibitorInterface *inhib
void SurfaceInterfacePrivate::surface_destroy_resource(Resource *) void SurfaceInterfacePrivate::surface_destroy_resource(Resource *)
{ {
emit q->aboutToBeUnbound(); emit q->aboutToBeDestroyed();
delete q; delete q;
} }
......
...@@ -368,9 +368,15 @@ public: ...@@ -368,9 +368,15 @@ public:
Q_SIGNALS: 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 * This signal is emitted when the projection matrix from the surface-local coordinate space
* to the buffer coordinate space has been changed. * to the buffer coordinate space has been changed.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment