summaryrefslogtreecommitdiffstats
path: root/src/gui/accessible
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-29 16:30:13 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-31 12:56:50 +0200
commit5747f3139219abd6c8670953620cee1f5584caba (patch)
tree07dda7644e3628ead8459efa304e36d705e36521 /src/gui/accessible
parent4ed483b0e24b410b6bb240b48b4ad71e67877dc2 (diff)
Another round of 0->nullptr cleanup
Change-Id: Ic8db7dc252f8fea46eb5a4f334726d6c7f4645a6 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/gui/accessible')
-rw-r--r--src/gui/accessible/linux/atspiadaptor.cpp6
-rw-r--r--src/gui/accessible/linux/qspiaccessiblebridge.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index a0c41fb7b3..8feaf58ca1 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -858,7 +858,7 @@ QAccessibleInterface *AtSpiAdaptor::interfaceFromPath(const QString& dbusPath) c
QStringList parts = dbusPath.split(QLatin1Char('/'));
if (parts.size() != 6) {
qCDebug(lcAccessibilityAtspi) << "invalid path: " << dbusPath;
- return 0;
+ return nullptr;
}
QString objectString = parts.at(5);
@@ -1613,7 +1613,7 @@ bool AtSpiAdaptor::componentInterface(QAccessibleInterface *interface, const QSt
}
QAccessibleInterface * childInterface(interface->childAt(x, y));
- QAccessibleInterface * iface = 0;
+ QAccessibleInterface * iface = nullptr;
while (childInterface) {
iface = childInterface;
childInterface = iface->childAt(x, y);
@@ -2301,7 +2301,7 @@ bool AtSpiAdaptor::tableInterface(QAccessibleInterface *interface, const QString
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
QVariant::fromValue(interface->tableInterface()->selectedRowCount())))));
} else if (function == QLatin1String("GetSummary")) {
- QAccessibleInterface * summary = interface->tableInterface() ? interface->tableInterface()->summary() : 0;
+ QAccessibleInterface *summary = interface->tableInterface() ? interface->tableInterface()->summary() : nullptr;
QSpiObjectReference ref(connection, QDBusObjectPath(pathForInterface(summary)));
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(QVariant::fromValue(ref)))));
} else if (function == QLatin1String("GetAccessibleAt")) {
diff --git a/src/gui/accessible/linux/qspiaccessiblebridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
index fb4bf1f27b..9b9b7a46a5 100644
--- a/src/gui/accessible/linux/qspiaccessiblebridge.cpp
+++ b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
*/
QSpiAccessibleBridge::QSpiAccessibleBridge()
- : cache(0), dec(0), dbusAdaptor(0)
+ : cache(nullptr), dec(nullptr), dbusAdaptor(nullptr)
{
dbusConnection = new DBusConnection();
connect(dbusConnection, SIGNAL(enabledChanged(bool)), this, SLOT(enabledChanged(bool)));