diff options
author | Johannes Kauffmann <johanneskauffmann@hotmail.com> | 2022-09-20 01:59:44 +0200 |
---|---|---|
committer | Johannes Kauffmann <johanneskauffmann@hotmail.com> | 2022-10-02 12:35:08 +0200 |
commit | d3f748c3400a74f37ee74b9eaa1f6f00c4fcde91 (patch) | |
tree | 19ca895f37c3bfeae7ba421cfeee7b93298e8525 /src/plugins/platforminputcontexts/ibus | |
parent | 42e48b470672999161a05324f0ba52cd8fdd7276 (diff) |
plugins: use nullptr instead of 0 and NULL
Change-Id: I7f3e56db1d0db178d8a7d9eb91c09e03cae89f6b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/platforminputcontexts/ibus')
-rw-r--r-- | src/plugins/platforminputcontexts/ibus/main.cpp | 3 | ||||
-rw-r--r-- | src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp | 14 |
2 files changed, 9 insertions, 8 deletions
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<QIBusText>(); 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)); } |