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

Make addRegistryListener protected

Browse Source 
Enables leaf classes that want to bind immediately to call it without
waiting for an event loop

Change-Id: I4a885959ef54ba12a2c46f3f1a668e8c0cf1d967
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
David Redondo 2021-01-27 15:35:41 +01:00
parent 8e16ebe3fb
commit 515282115d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
View File

@ -71,10 +71,13 @@ void QWaylandClientExtensionPrivate::handleRegistryGlobal(void *data, ::wl_regis
} }
} }
void QWaylandClientExtension::addRegistryListener() void QWaylandClientExtension::initialize()
{ {
Q_D(QWaylandClientExtension); Q_D(QWaylandClientExtension);
d->waylandIntegration->display()->addRegistryListener(&QWaylandClientExtensionPrivate::handleRegistryGlobal, this); if (!d->registered) {
d->waylandIntegration->display()->addRegistryListener(&QWaylandClientExtensionPrivate::handleRegistryGlobal, this);
d->registered = true;
}
} }
QWaylandClientExtension::QWaylandClientExtension(const int ver) QWaylandClientExtension::QWaylandClientExtension(const int ver)
@ -85,7 +88,7 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver)
// The registry listener uses virtual functions and we don't want it to be called from // The registry listener uses virtual functions and we don't want it to be called from
// the constructor. // the constructor.
QMetaObject::invokeMethod(this, "addRegistryListener", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "initialize", Qt::QueuedConnection);
} }
QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const

4
src/plugins/platforms/wayland/global/qwaylandclientextension.h
View File

@ -76,8 +76,8 @@ Q_SIGNALS:
void versionChanged(); void versionChanged();
void activeChanged(); void activeChanged();
private Q_SLOTS: protected Q_SLOTS:
void addRegistryListener(); void initialize();
}; };
template <typename T> template <typename T>

1
src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
View File

@ -68,6 +68,7 @@ public:
QtWaylandClient::QWaylandIntegration *waylandIntegration = nullptr; QtWaylandClient::QWaylandIntegration *waylandIntegration = nullptr;
int version = -1; int version = -1;
bool active = false; bool active = false;
bool registered = false;
}; };
class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionTemplatePrivate : public QWaylandClientExtensionPrivate class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionTemplatePrivate : public QWaylandClientExtensionPrivate