summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylanddisplay.cpp
diff options
context:
space:
mode:
authorJorgen Lind <jorgen.lind@digia.com>2013-11-22 09:08:06 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-27 15:32:57 +0100
commite2350c6abe087a27deb7b1288c09a9cc48d585e1 (patch)
tree1ca849da69455b1c3522eddf3fcd8679bcdcb637 /src/client/qwaylanddisplay.cpp
parent3a1ac7eb8adabbb27fea28f939c7d0197a7e450d (diff)
Remove compiler warnings in client.
Change-Id: Iedd2e53aa8d6c8d09272175e402e64bdb40acb36 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
-rw-r--r--src/client/qwaylanddisplay.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 880c76df8..436f58bb9 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -205,30 +205,30 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
struct ::wl_registry *registry = object();
- if (interface == "wl_output") {
+ if (interface == QStringLiteral("wl_output")) {
mScreens.append(new QWaylandScreen(this, id));
- } else if (interface == "wl_compositor") {
+ } else if (interface == QStringLiteral("wl_compositor")) {
mCompositor.init(registry, id);
- } else if (interface == "wl_shm") {
+ } else if (interface == QStringLiteral("wl_shm")) {
mShm = static_cast<struct wl_shm *>(wl_registry_bind(registry, id, &wl_shm_interface,1));
- } else if (interface == "wl_shell"){
+ } else if (interface == QStringLiteral("wl_shell")){
mShell = new QtWayland::wl_shell(registry, id);
- } else if (interface == "wl_seat") {
+ } else if (interface == QStringLiteral("wl_seat")) {
QWaylandInputDevice *inputDevice = new QWaylandInputDevice(this, id);
mInputDevices.append(inputDevice);
- } else if (interface == "wl_data_device_manager") {
+ } else if (interface == QStringLiteral("wl_data_device_manager")) {
mDndSelectionHandler = new QWaylandDataDeviceManager(this, id);
- } else if (interface == "qt_output_extension") {
+ } else if (interface == QStringLiteral("qt_output_extension")) {
mOutputExtension = new QtWayland::qt_output_extension(registry, id);
foreach (QPlatformScreen *screen, screens())
static_cast<QWaylandScreen *>(screen)->createExtendedOutput();
- } else if (interface == "qt_surface_extension") {
+ } else if (interface == QStringLiteral("qt_surface_extension")) {
mWindowExtension = new QtWayland::qt_surface_extension(registry, id);
- } else if (interface == "qt_sub_surface_extension") {
+ } else if (interface == QStringLiteral("qt_sub_surface_extension")) {
mSubSurfaceExtension = new QtWayland::qt_sub_surface_extension(registry, id);
- } else if (interface == "qt_touch_extension") {
+ } else if (interface == QStringLiteral("qt_touch_extension")) {
mTouchExtension = new QWaylandTouchExtension(this, id);
- } else if (interface == "qt_key_extension") {
+ } else if (interface == QStringLiteral("qt_key_extension")) {
mQtKeyExtension = new QWaylandQtKeyExtension(this, id);
} else if (interface == "wl_text_input_manager") {
mTextInputManager = new QtWayland::wl_text_input_manager(registry, id);