diff options
author | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2016-04-08 08:30:36 +0200 |
---|---|---|
committer | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2016-05-31 14:17:26 +0000 |
commit | 58bfe9d9b51786792d5b7af8a90698af87207ad1 (patch) | |
tree | 6a5737a3c9577d8d93e5b4f5a8e8b1cab2db52f9 /src/compositor/compositor_api/qwaylandcompositor.cpp | |
parent | 25ac3b504574b5e177c8f92eb02b83fdcc31d624 (diff) |
Rename QWaylandWindowManagerExtension to QWaylandQtWindowManager
* QWaylandWindowManagerExtension become QWaylandQtWindowManager
* WindowManager become QtWindowManager
Follow naming convention already established for other extensions
like QWaylandWlShell and avoid confusion that might arise with
a name as generic as WindowManager.
Use QWaylandClient rather than wl_client.
Also the Wayland protocol definition has been renamed
to qt-windowmanager.xml
Change-Id: I941621ce229327c21eff9e80c7e92205cc60e8eb
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 41de5b459..3a499fa74 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -60,7 +60,7 @@ #include "hardware_integration/qwlserverbufferintegrationfactory_p.h" #include "hardware_integration/qwlhwintegration_p.h" -#include "extensions/qwaylandwindowmanagerextension.h" +#include "extensions/qwaylandqtwindowmanager.h" #include "qwaylandxkb_p.h" #include "qwaylandshmformathelper_p.h" @@ -572,9 +572,9 @@ void QWaylandCompositor::destroyClient(QWaylandClient *client) if (!client) return; - QWaylandWindowManagerExtension *wmExtension = QWaylandWindowManagerExtension::findIn(this); + QWaylandQtWindowManager *wmExtension = QWaylandQtWindowManager::findIn(this); if (wmExtension) - wmExtension->sendQuitMessage(client->client()); + wmExtension->sendQuitMessage(client); wl_client_destroy(client->client()); } |