From 754b2b21b0ce0e435ddc3c8ddce3bd6e12915f96 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Sat, 14 Jul 2018 08:44:58 +0200
Subject: Use nullptr and shared null
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Relying on the implicit cast for QByteArray from 0 actually does not
result in returning sharedNull and is confusing to read.

Change-Id: I0aeef058e9f15b9fe5a53a7ed93f378bc2c74b96
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
---
 src/x11extras/qx11info_x11.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index f503509..77caca7 100644
--- a/src/x11extras/qx11info_x11.cpp
+++ b/src/x11extras/qx11info_x11.cpp
@@ -310,10 +310,10 @@ unsigned long QX11Info::getTimestamp()
 QByteArray QX11Info::nextStartupId()
 {
     if (!qApp)
-        return 0;
+        return QByteArray();
     QPlatformNativeInterface *native = qApp->platformNativeInterface();
     if (!native)
-        return 0;
+        return QByteArray();
     return static_cast<char *>(native->nativeResourceForIntegration("startupid"));
 }
 
@@ -352,10 +352,10 @@ void QX11Info::setNextStartupId(const QByteArray &id)
 Display *QX11Info::display()
 {
     if (!qApp)
-        return NULL;
+        return nullptr;
     QPlatformNativeInterface *native = qApp->platformNativeInterface();
     if (!native)
-        return NULL;
+        return nullptr;
 
     void *display = native->nativeResourceForIntegration(QByteArray("display"));
     return reinterpret_cast<Display *>(display);
@@ -369,10 +369,10 @@ Display *QX11Info::display()
 xcb_connection_t *QX11Info::connection()
 {
     if (!qApp)
-        return NULL;
+        return nullptr;
     QPlatformNativeInterface *native = qApp->platformNativeInterface();
     if (!native)
-        return NULL;
+        return nullptr;
 
     void *connection = native->nativeResourceForIntegration(QByteArray("connection"));
     return reinterpret_cast<xcb_connection_t *>(connection);
-- 
cgit v1.2.3