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

Remove compiler warnings in client.

Browse Source 
Change-Id: Iedd2e53aa8d6c8d09272175e402e64bdb40acb36
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Jorgen Lind 2013-11-22 09:08:06 +01:00 committed by The Qt Project
parent 6a33e75b8d
commit ba54fc0bb1
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -205,30 +205,30 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
struct ::wl_registry *registry = object(); struct ::wl_registry *registry = object();
if (interface == "wl_output") { if (interface == QStringLiteral("wl_output")) {
mScreens.append(new QWaylandScreen(this, id)); mScreens.append(new QWaylandScreen(this, id));
} else if (interface == "wl_compositor") { } else if (interface == QStringLiteral("wl_compositor")) {
mCompositor.init(registry, id); 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)); 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); mShell = new QtWayland::wl_shell(registry, id);
} else if (interface == "wl_seat") { } else if (interface == QStringLiteral("wl_seat")) {
QWaylandInputDevice *inputDevice = new QWaylandInputDevice(this, id); QWaylandInputDevice *inputDevice = new QWaylandInputDevice(this, id);
mInputDevices.append(inputDevice); mInputDevices.append(inputDevice);
} else if (interface == "wl_data_device_manager") { } else if (interface == QStringLiteral("wl_data_device_manager")) {
mDndSelectionHandler = new QWaylandDataDeviceManager(this, id); 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); mOutputExtension = new QtWayland::qt_output_extension(registry, id);
foreach (QPlatformScreen *screen, screens()) foreach (QPlatformScreen *screen, screens())
static_cast<QWaylandScreen *>(screen)->createExtendedOutput(); 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); 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); 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); mTouchExtension = new QWaylandTouchExtension(this, id);
} else if (interface == "qt_key_extension") { } else if (interface == QStringLiteral("qt_key_extension")) {
mQtKeyExtension = new QWaylandQtKeyExtension(this, id); mQtKeyExtension = new QWaylandQtKeyExtension(this, id);
} else if (interface == "wl_text_input_manager") { } else if (interface == "wl_text_input_manager") {
mTextInputManager = new QtWayland::wl_text_input_manager(registry, id); mTextInputManager = new QtWayland::wl_text_input_manager(registry, id);

2
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -90,7 +90,7 @@ public:
desktopEnvironment != QByteArrayLiteral("MATE") && desktopEnvironment != QByteArrayLiteral("MATE") &&
desktopEnvironment != QByteArrayLiteral("XFCE") && desktopEnvironment != QByteArrayLiteral("XFCE") &&
desktopEnvironment != QByteArrayLiteral("LXDE")) desktopEnvironment != QByteArrayLiteral("LXDE"))
result.push_back(desktopEnvironment.toLower()); result.push_back(QString::fromLocal8Bit(desktopEnvironment.toLower()));
} }
if (result.isEmpty()) if (result.isEmpty())

2
src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.cpp
View File

@ -93,7 +93,7 @@ bool QWaylandWindowManagerIntegration::showIsFullScreen() const
void QWaylandWindowManagerIntegration::wlHandleListenerGlobal(void *data, wl_registry *registry, uint32_t id, const QString &interface, uint32_t version) void QWaylandWindowManagerIntegration::wlHandleListenerGlobal(void *data, wl_registry *registry, uint32_t id, const QString &interface, uint32_t version)
{ {
Q_UNUSED(version); Q_UNUSED(version);
if (interface == "qt_windowmanager") if (interface == QStringLiteral("qt_windowmanager"))
static_cast<QWaylandWindowManagerIntegration *>(data)->init(registry, id); static_cast<QWaylandWindowManagerIntegration *>(data)->init(registry, id);
} }