From d3f748c3400a74f37ee74b9eaa1f6f00c4fcde91 Mon Sep 17 00:00:00 2001 From: Johannes Kauffmann Date: Tue, 20 Sep 2022 01:59:44 +0200 Subject: plugins: use nullptr instead of 0 and NULL Change-Id: I7f3e56db1d0db178d8a7d9eb91c09e03cae89f6b Reviewed-by: Volker Hilsheimer --- src/plugins/generic/evdevkeyboard/main.cpp | 3 ++- src/plugins/generic/evdevmouse/main.cpp | 3 ++- src/plugins/generic/evdevtablet/main.cpp | 2 +- src/plugins/generic/evdevtouch/main.cpp | 2 +- src/plugins/generic/libinput/main.cpp | 2 +- src/plugins/generic/tslib/main.cpp | 2 +- src/plugins/generic/tuiotouch/main.cpp | 2 +- .../networkmanager/qnetworkmanagerservice.h | 2 +- src/plugins/platforminputcontexts/ibus/main.cpp | 3 ++- .../ibus/qibusplatforminputcontext.cpp | 14 +++++++------- src/plugins/platforms/linuxfb/main.cpp | 2 +- src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp | 2 +- src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp | 4 ++-- src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 8 ++++---- src/plugins/platforms/minimal/main.cpp | 2 +- src/plugins/platforms/minimal/qminimalintegration.cpp | 2 +- src/plugins/platforms/minimalegl/main.cpp | 2 +- .../platforms/minimalegl/qminimaleglbackingstore.cpp | 2 +- src/plugins/platforms/minimalegl/qminimaleglscreen.cpp | 8 ++++---- src/plugins/platforms/offscreen/qoffscreencommon.cpp | 2 +- src/plugins/platforms/offscreen/qoffscreenwindow.cpp | 2 +- src/plugins/platforms/vkkhrdisplay/main.cpp | 2 +- src/plugins/platforms/xcb/qxcbconnection.cpp | 4 ++-- src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 6 +++--- src/plugins/sqldrivers/sqlite/smain.cpp | 3 ++- 25 files changed, 45 insertions(+), 41 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp index 00d4c216d8..2931fea907 100644 --- a/src/plugins/generic/evdevkeyboard/main.cpp +++ b/src/plugins/generic/evdevkeyboard/main.cpp @@ -27,7 +27,8 @@ QObject* QEvdevKeyboardPlugin::create(const QString &key, { if (!key.compare(QLatin1String("EvdevKeyboard"), Qt::CaseInsensitive)) return new QEvdevKeyboardManager(key, specification); - return 0; + + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp index dd24c85d81..9629d2c927 100644 --- a/src/plugins/generic/evdevmouse/main.cpp +++ b/src/plugins/generic/evdevmouse/main.cpp @@ -27,7 +27,8 @@ QObject* QEvdevMousePlugin::create(const QString &key, { if (!key.compare(QLatin1String("EvdevMouse"), Qt::CaseInsensitive)) return new QEvdevMouseManager(key, specification); - return 0; + + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp index 4ac58333e9..6313c09921 100644 --- a/src/plugins/generic/evdevtablet/main.cpp +++ b/src/plugins/generic/evdevtablet/main.cpp @@ -27,7 +27,7 @@ QObject* QEvdevTabletPlugin::create(const QString &key, if (!key.compare(QLatin1String("EvdevTablet"), Qt::CaseInsensitive)) return new QEvdevTabletManager(key, spec); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp index 958a69f032..f39f9645bc 100644 --- a/src/plugins/generic/evdevtouch/main.cpp +++ b/src/plugins/generic/evdevtouch/main.cpp @@ -27,7 +27,7 @@ QObject* QEvdevTouchScreenPlugin::create(const QString &key, if (!key.compare(QLatin1String("EvdevTouch"), Qt::CaseInsensitive)) return new QEvdevTouchManager(key, spec); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/generic/libinput/main.cpp b/src/plugins/generic/libinput/main.cpp index 3005868b57..a191fd3d9b 100644 --- a/src/plugins/generic/libinput/main.cpp +++ b/src/plugins/generic/libinput/main.cpp @@ -20,7 +20,7 @@ QObject *QLibInputPlugin::create(const QString &key, const QString &specificatio if (!key.compare(QLatin1String("libinput"), Qt::CaseInsensitive)) return new QLibInputHandler(key, specification); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/generic/tslib/main.cpp b/src/plugins/generic/tslib/main.cpp index bb3041eb56..c2f4ccb105 100644 --- a/src/plugins/generic/tslib/main.cpp +++ b/src/plugins/generic/tslib/main.cpp @@ -22,7 +22,7 @@ QObject* QTsLibPlugin::create(const QString &key, || !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive)) return new QTsLibMouseHandler(key, specification); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/generic/tuiotouch/main.cpp b/src/plugins/generic/tuiotouch/main.cpp index 30f3af3597..037a5d64a0 100644 --- a/src/plugins/generic/tuiotouch/main.cpp +++ b/src/plugins/generic/tuiotouch/main.cpp @@ -30,7 +30,7 @@ QObject* QTuioTouchPlugin::create(const QString &key, if (!key.compare(QLatin1String("TuioTouch"), Qt::CaseInsensitive)) return new QTuioHandler(spec); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h index 30e7945d28..9ca862d398 100644 --- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h +++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h @@ -161,7 +161,7 @@ class PropertiesDBusInterface : public QDBusAbstractInterface { public: PropertiesDBusInterface(const QString &service, const QString &path, const QString &interface, - const QDBusConnection &connection, QObject *parent = 0) + const QDBusConnection &connection, QObject *parent = nullptr) : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent) { } diff --git a/src/plugins/platforminputcontexts/ibus/main.cpp b/src/plugins/platforminputcontexts/ibus/main.cpp index 52d2cd0084..a0036db31e 100644 --- a/src/plugins/platforminputcontexts/ibus/main.cpp +++ b/src/plugins/platforminputcontexts/ibus/main.cpp @@ -30,7 +30,8 @@ QIBusPlatformInputContext *QIbusPlatformInputContextPlugin::create(const QString qDBusRegisterMetaType(); return new QIBusPlatformInputContext; } - return 0; + + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index ca468f5ada..dc6a9ad17a 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -468,7 +468,7 @@ void QIBusPlatformInputContext::filterEventFinished(QDBusPendingCallWatcher *cal if (!filtered) { #ifndef QT_NO_CONTEXTMENU if (type == QEvent::KeyPress && qtcode == Qt::Key_Menu - && window != NULL) { + && window != nullptr) { const QPoint globalPos = window->screen()->handle()->cursor()->pos(); const QPoint pos = window->mapFromGlobal(globalPos); QWindowSystemInterfacePrivate::ContextMenuEvent contextMenuEvent(window, false, pos, @@ -581,10 +581,10 @@ static bool shouldConnectIbusPortal() } QIBusPlatformInputContextPrivate::QIBusPlatformInputContextPrivate() - : connection(0), - bus(0), - portalBus(0), - context(0), + : connection(nullptr), + bus(nullptr), + portalBus(nullptr), + context(nullptr), usePortal(shouldConnectIbusPortal()), valid(false), busConnected(false), @@ -721,7 +721,7 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection() QFile file(getSocketPath()); if (!file.open(QFile::ReadOnly)) - return 0; + return nullptr; QByteArray address; int pid = -1; @@ -740,7 +740,7 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection() if (debug) qDebug() << "IBUS_ADDRESS=" << address << "PID=" << pid; if (address.isEmpty() || pid < 0 || kill(pid, 0) != 0) - return 0; + return nullptr; return new QDBusConnection(QDBusConnection::connectToBus(QString::fromLatin1(address), "QIBusProxy"_L1)); } diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp index 9d05e64466..12aaafc21a 100644 --- a/src/plugins/platforms/linuxfb/main.cpp +++ b/src/plugins/platforms/linuxfb/main.cpp @@ -22,7 +22,7 @@ QPlatformIntegration* QLinuxFbIntegrationPlugin::create(const QString& system, c if (!system.compare("linuxfb"_L1, Qt::CaseInsensitive)) return new QLinuxFbIntegration(paramList); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp index beb8349635..55c9e472f8 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp @@ -243,7 +243,7 @@ bool QLinuxFbDevice::createFramebuffer(QLinuxFbDevice::Output *output, int buffe qErrnoWarning(errno, "Failed to map dumb buffer"); return false; } - fb.p = mmap(0, fb.size, PROT_READ | PROT_WRITE, MAP_SHARED, fd(), mreq.offset); + fb.p = mmap(nullptr, fb.size, PROT_READ | PROT_WRITE, MAP_SHARED, fd(), mreq.offset); if (fb.p == MAP_FAILED) { qErrnoWarning(errno, "Failed to mmap dumb buffer"); return false; diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index a9ab8463f4..f87766cf1b 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -42,7 +42,7 @@ QLinuxFbIntegration::QLinuxFbIntegration(const QStringList ¶mList) : m_primaryScreen(nullptr), m_fontDb(new QGenericUnixFontDatabase), m_services(new QGenericUnixServices), - m_kbdMgr(0) + m_kbdMgr(nullptr) { #if QT_CONFIG(kms) if (qEnvironmentVariableIntValue("QT_QPA_FB_DRM") != 0) @@ -147,7 +147,7 @@ QPlatformNativeInterface *QLinuxFbIntegration::nativeInterface() const QFunctionPointer QLinuxFbIntegration::platformFunction(const QByteArray &function) const { Q_UNUSED(function); - return 0; + return nullptr; } #if QT_CONFIG(evdev) diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp index 1fedb546eb..24cab2ee23 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp @@ -213,7 +213,7 @@ static QImage::Format determineFormat(const fb_var_screeninfo &info, int depth) static int openTtyDevice(const QString &device) { - const char *const devs[] = { "/dev/tty0", "/dev/tty", "/dev/console", 0 }; + const char *const devs[] = { "/dev/tty0", "/dev/tty", "/dev/console", nullptr }; int fd = -1; if (device.isEmpty()) { @@ -253,9 +253,9 @@ static void blankScreen(int fd, bool on) } QLinuxFbScreen::QLinuxFbScreen(const QStringList &args) - : mArgs(args), mFbFd(-1), mTtyFd(-1), mBlitter(0) + : mArgs(args), mFbFd(-1), mTtyFd(-1), mBlitter(nullptr) { - mMmap.data = 0; + mMmap.data = nullptr; } QLinuxFbScreen::~QLinuxFbScreen() @@ -344,7 +344,7 @@ bool QLinuxFbScreen::initialize() // mmap the framebuffer mMmap.size = finfo.smem_len; - uchar *data = (unsigned char *)mmap(0, mMmap.size, PROT_READ | PROT_WRITE, MAP_SHARED, mFbFd, 0); + uchar *data = (unsigned char *)mmap(nullptr, mMmap.size, PROT_READ | PROT_WRITE, MAP_SHARED, mFbFd, 0); if ((long)data == -1) { qErrnoWarning(errno, "Failed to mmap framebuffer"); return false; diff --git a/src/plugins/platforms/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp index 426ca2ad11..03cb3ca588 100644 --- a/src/plugins/platforms/minimal/main.cpp +++ b/src/plugins/platforms/minimal/main.cpp @@ -22,7 +22,7 @@ QPlatformIntegration *QMinimalIntegrationPlugin::create(const QString& system, c if (!system.compare("minimal"_L1, Qt::CaseInsensitive)) return new QMinimalIntegration(paramList); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index a145093872..240d943f4d 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -58,7 +58,7 @@ static inline unsigned parseOptions(const QStringList ¶mList) } QMinimalIntegration::QMinimalIntegration(const QStringList ¶meters) - : m_fontDatabase(0) + : m_fontDatabase(nullptr) , m_options(parseOptions(parameters)) { if (qEnvironmentVariableIsSet(debugBackingStoreEnvironmentVariable) diff --git a/src/plugins/platforms/minimalegl/main.cpp b/src/plugins/platforms/minimalegl/main.cpp index 8f7d91dce9..3586535277 100644 --- a/src/plugins/platforms/minimalegl/main.cpp +++ b/src/plugins/platforms/minimalegl/main.cpp @@ -22,7 +22,7 @@ QPlatformIntegration* QMinimalEglIntegrationPlugin::create(const QString& system if (!system.compare("minimalegl"_L1, Qt::CaseInsensitive)) return new QMinimalEglIntegration; - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp b/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp index 5b18ffda2c..88131f4f99 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE QMinimalEglBackingStore::QMinimalEglBackingStore(QWindow *window) : QPlatformBackingStore(window) , m_context(new QOpenGLContext) - , m_device(0) + , m_device(nullptr) { m_context->setFormat(window->requestedFormat()); m_context->setScreen(window->screen()); diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp index 64123f0e8f..716caea067 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp @@ -41,8 +41,8 @@ public: QMinimalEglScreen::QMinimalEglScreen(EGLNativeDisplayType display) : m_depth(32) , m_format(QImage::Format_Invalid) - , m_platformContext(0) - , m_surface(0) + , m_platformContext(nullptr) + , m_surface(nullptr) { #ifdef QEGL_EXTRA_DEBUG qWarning("QEglScreen %p\n", this); @@ -123,7 +123,7 @@ void QMinimalEglScreen::createAndSetPlatformContext() q_printEglConfig(m_dpy, config); #endif - m_surface = eglCreateWindowSurface(m_dpy, config, eglWindow, NULL); + m_surface = eglCreateWindowSurface(m_dpy, config, eglWindow, nullptr); if (Q_UNLIKELY(m_surface == EGL_NO_SURFACE)) { qWarning("Could not create the egl surface: error = 0x%x\n", eglGetError()); eglTerminate(m_dpy); @@ -132,7 +132,7 @@ void QMinimalEglScreen::createAndSetPlatformContext() // qWarning("Created surface %dx%d\n", w, h); #ifndef QT_NO_OPENGL - QEGLPlatformContext *platformContext = new QMinimalEglContext(platformFormat, 0, m_dpy); + QEGLPlatformContext *platformContext = new QMinimalEglContext(platformFormat, nullptr, m_dpy); m_platformContext = platformContext; #endif EGLint w,h; // screen size detection diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.cpp b/src/plugins/platforms/offscreen/qoffscreencommon.cpp index 6e063a2b56..9152795e9f 100644 --- a/src/plugins/platforms/offscreen/qoffscreencommon.cpp +++ b/src/plugins/platforms/offscreen/qoffscreencommon.cpp @@ -189,7 +189,7 @@ QPixmap QOffscreenBackingStore::grabWindow(WId window, const QRect &rect) const QOffscreenBackingStore *QOffscreenBackingStore::backingStoreForWinId(WId id) { - return m_backingStoreForWinIdHash.value(id, 0); + return m_backingStoreForWinIdHash.value(id, nullptr); } void QOffscreenBackingStore::clearHash() diff --git a/src/plugins/platforms/offscreen/qoffscreenwindow.cpp b/src/plugins/platforms/offscreen/qoffscreenwindow.cpp index 6f61d72ed3..20ed0ed91b 100644 --- a/src/plugins/platforms/offscreen/qoffscreenwindow.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenwindow.cpp @@ -165,7 +165,7 @@ void QOffscreenWindow::setWindowState(Qt::WindowStates state) QOffscreenWindow *QOffscreenWindow::windowForWinId(WId id) { - return m_windowForWinIdHash.value(id, 0); + return m_windowForWinIdHash.value(id, nullptr); } Q_CONSTINIT QHash QOffscreenWindow::m_windowForWinIdHash; diff --git a/src/plugins/platforms/vkkhrdisplay/main.cpp b/src/plugins/platforms/vkkhrdisplay/main.cpp index c11305607b..aa2dc3abf5 100644 --- a/src/plugins/platforms/vkkhrdisplay/main.cpp +++ b/src/plugins/platforms/vkkhrdisplay/main.cpp @@ -21,7 +21,7 @@ QPlatformIntegration *QVkKhrDisplayIntegrationPlugin::create(const QString &syst if (!system.compare("vkkhrdisplay"_L1, Qt::CaseInsensitive)) return new QVkKhrDisplayIntegration(paramList); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 0750969703..b7576b969c 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -141,12 +141,12 @@ void QXcbConnection::removeWindowEventListener(xcb_window_t id) QXcbWindowEventListener *QXcbConnection::windowEventListenerFromId(xcb_window_t id) { - return m_mapper.value(id, 0); + return m_mapper.value(id, nullptr); } QXcbWindow *QXcbConnection::platformWindowFromId(xcb_window_t id) { - QXcbWindowEventListener *listener = m_mapper.value(id, 0); + QXcbWindowEventListener *listener = m_mapper.value(id, nullptr); if (listener) return listener->toWindow(); return nullptr; diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index 51a3908867..9611da37ea 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -158,7 +158,7 @@ void QSQLiteResultPrivate::finalize() return; sqlite3_finalize(stmt); - stmt = 0; + stmt = nullptr; } void QSQLiteResultPrivate::initColumns(bool emptyResultset) @@ -765,7 +765,7 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c if (d->access) { sqlite3_close(d->access); - d->access = 0; + d->access = nullptr; } return false; @@ -788,7 +788,7 @@ void QSQLiteDriver::close() if (res != SQLITE_OK) setLastError(qMakeError(d->access, tr("Error closing database"), QSqlError::ConnectionError, res)); - d->access = 0; + d->access = nullptr; setOpen(false); setOpenError(false); } diff --git a/src/plugins/sqldrivers/sqlite/smain.cpp b/src/plugins/sqldrivers/sqlite/smain.cpp index 9223cca850..f84a256bc8 100644 --- a/src/plugins/sqldrivers/sqlite/smain.cpp +++ b/src/plugins/sqldrivers/sqlite/smain.cpp @@ -31,7 +31,8 @@ QSqlDriver* QSQLiteDriverPlugin::create(const QString &name) QSQLiteDriver* driver = new QSQLiteDriver(); return driver; } - return 0; + + return nullptr; } QT_END_NAMESPACE -- cgit v1.2.3