diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-11-17 14:42:48 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-28 18:47:32 +0100 |
| commit | 50995e6936c5ca75a0a8a48c29bbbedd2cc60567 (patch) | |
| tree | d53ff640cbb05156261971de1ba1c08bb2e6e32e /src/dbus | |
| parent | 8b12b566dba537dd15dca574e19c1eca9027be0b (diff) | |
Fix clang warning about bool to pointer conversion.
The operation is legal from C++ perspective but only for "false" as it
is guaranteed to be 0. Anyway returning 0 instead of "false" is
logical and it follows coding style used in the modified functions.
Change-Id: Ia09758e8d28599097f5c40eb24722890508afdbc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusutil.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index a55ff14fcf..7d3cf9be4c 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -937,7 +937,7 @@ QObject *QDBusConnection::objectRegisteredAt(const QString &path) const Q_ASSERT_X(QDBusUtil::isValidObjectPath(path), "QDBusConnection::registeredObject", "Invalid object path given"); if (!d || !d->connection || !QDBusUtil::isValidObjectPath(path)) - return false; + return 0; QStringList pathComponents = path.split(QLatin1Char('/')); if (pathComponents.last().isEmpty()) diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index cc164076a8..0c7f0e63e0 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.cpp @@ -259,7 +259,7 @@ static const char *validateSingleType(const char *signature) { register char c = *signature; if (c == DBUS_TYPE_INVALID) - return false; + return 0; // is it one of the one-letter types? if (strchr(oneLetterTypes, c) != NULL) |