From e5a4c825cdb615a10d122a7386bd0cc98506d159 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 26 Sep 2026 16:04:08 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/tools/dbusxml2qt3/methodgen.cpp | 4 +- src/tqdbusconnection.cpp | 24 ++++---- src/tqdbusconnection.h | 2 +- src/tqdbusconnection_p.h | 4 +- src/tqdbusdata.cpp | 110 ++++++++++++++++++------------------ src/tqdbusdata.h | 52 ++++++++--------- src/tqdbusdatalist.cpp | 52 ++++++++--------- src/tqdbusdatalist.h | 28 ++++----- src/tqdbusintegrator.cpp | 34 +++++------ src/tqdbusmarshall.cpp | 24 ++++---- src/tqdbusmessage.cpp | 6 +- src/tqdbusproxy.h | 10 ++-- src/tqdbusserver.h | 2 +- src/tqdbusunixfd.cpp | 2 +- 14 files changed, 177 insertions(+), 177 deletions(-) diff --git a/src/tools/dbusxml2qt3/methodgen.cpp b/src/tools/dbusxml2qt3/methodgen.cpp index a057d7d..acc2b21 100644 --- a/src/tools/dbusxml2qt3/methodgen.cpp +++ b/src/tools/dbusxml2qt3/methodgen.cpp @@ -288,7 +288,7 @@ static TQMap extractTypeAnnotations(const TQDomElement& elem return annotations; } -static bool hasAnnotation(const TQDomElement& element, const TQString& annotation, TQString* value = 0) +static bool hasAnnotation(const TQDomElement& element, const TQString& annotation, TQString* value = nullptr) { for (TQDomNode node = element.firstChild(); !node.isNull(); node = node.nextSibling()) @@ -299,7 +299,7 @@ static bool hasAnnotation(const TQDomElement& element, const TQString& annotatio if (childElement.tagName() != "annotation") continue; if (childElement.attribute("name") != annotation) continue; - if (value != 0) *value = childElement.attribute("value"); + if (value) *value = childElement.attribute("value"); return true; } diff --git a/src/tqdbusconnection.cpp b/src/tqdbusconnection.cpp index 76be5be..f670699 100644 --- a/src/tqdbusconnection.cpp +++ b/src/tqdbusconnection.cpp @@ -36,7 +36,7 @@ const char *TQT_DBusConnection::default_connection_name = "qt_dbus_default_conne class TQT_DBusConnectionManager { public: - TQT_DBusConnectionManager(): default_connection(0) {} + TQT_DBusConnectionManager(): default_connection(nullptr) {} ~TQT_DBusConnectionManager(); void bindToApplication(); TQT_DBusConnectionPrivate *connection(const TQString &name) const; @@ -44,7 +44,7 @@ public: void setConnection(const TQString &name, TQT_DBusConnectionPrivate *c); static TQT_DBusConnectionManager* instance() { - if (managerInstance == 0) managerInstance = new TQT_DBusConnectionManager(); + if (managerInstance == nullptr) managerInstance = new TQT_DBusConnectionManager(); return managerInstance; } @@ -58,7 +58,7 @@ private: }; // FIXME-QT4 TQ_GLOBAL_STATIC(TQT_DBusConnectionManager, manager); -TQT_DBusConnectionManager* TQT_DBusConnectionManager::managerInstance = 0; +TQT_DBusConnectionManager* TQT_DBusConnectionManager::managerInstance = nullptr; TQT_DBusConnectionManager* manager() { return TQT_DBusConnectionManager::instance(); } @@ -70,15 +70,15 @@ TQT_DBusConnectionPrivate *TQT_DBusConnectionManager::connection(const TQString ConnectionHash::const_iterator it = connectionHash.find(name); - return (it != connectionHash.end() ? it.data() : 0); + return (it != connectionHash.end() ? it.data() : nullptr); } void TQT_DBusConnectionManager::removeConnection(const TQString &name) { - TQT_DBusConnectionPrivate *d = 0; + TQT_DBusConnectionPrivate *d = nullptr; if (name == TQString::fromLatin1(TQT_DBusConnection::default_connection_name)) { d = default_connection; - default_connection = 0; + default_connection = nullptr; } else { ConnectionHash::iterator it = connectionHash.find(name); if (it == connectionHash.end()) @@ -95,7 +95,7 @@ TQT_DBusConnectionManager::~TQT_DBusConnectionManager() { if (default_connection) { delete default_connection; - default_connection = 0; + default_connection = nullptr; } /* FIXME-QT4 for (TQHash::const_iterator it = connectionHash.constBegin(); @@ -141,7 +141,7 @@ void TQT_DBusConnectionManager::setConnection(const TQString &name, TQT_DBusConn } -TQT_DBusConnection::TQT_DBusConnection() : d(0) +TQT_DBusConnection::TQT_DBusConnection() : d(nullptr) { } @@ -200,7 +200,7 @@ TQT_DBusConnection TQT_DBusConnection::addConnection(BusType type, const TQStrin return TQT_DBusConnection(name); d = new TQT_DBusConnectionPrivate; - DBusConnection *c = 0; + DBusConnection *c = nullptr; switch (type) { case SystemBus: c = dbus_bus_get(DBUS_BUS_SYSTEM, &d->error); @@ -258,7 +258,7 @@ bool TQT_DBusConnection::send(const TQT_DBusMessage &message) const if (!msg) return false; - bool isOk = dbus_connection_send(d->connection, msg, 0); + bool isOk = dbus_connection_send(d->connection, msg, nullptr); dbus_message_unref(msg); return isOk; } @@ -275,11 +275,11 @@ int TQT_DBusConnection::sendWithAsyncReply(const TQT_DBusMessage &message, TQObj TQT_DBusMessage TQT_DBusConnection::sendWithReply(const TQT_DBusMessage &message, TQT_DBusError *error) const { if (!d || !d->connection) - return TQT_DBusMessage::fromDBusMessage(0); + return TQT_DBusMessage::fromDBusMessage(nullptr); DBusMessage *msg = message.toDBusMessage(); if (!msg) - return TQT_DBusMessage::fromDBusMessage(0); + return TQT_DBusMessage::fromDBusMessage(nullptr); DBusMessage *reply = dbus_connection_send_with_reply_and_block(d->connection, msg, -1, &d->error); diff --git a/src/tqdbusconnection.h b/src/tqdbusconnection.h index a1696a9..c9d7dca 100644 --- a/src/tqdbusconnection.h +++ b/src/tqdbusconnection.h @@ -390,7 +390,7 @@ public: * * @see lastError() */ - TQT_DBusMessage sendWithReply(const TQT_DBusMessage &message, TQT_DBusError *error = 0) const; + TQT_DBusMessage sendWithReply(const TQT_DBusMessage &message, TQT_DBusError *error = nullptr) const; /** * @brief Sends a message over the bus, specifying a receiver object for diff --git a/src/tqdbusconnection_p.h b/src/tqdbusconnection_p.h index 0321215..7568bef 100644 --- a/src/tqdbusconnection_p.h +++ b/src/tqdbusconnection_p.h @@ -72,7 +72,7 @@ class TQT_DBusConnectionPrivate: public TQObject public: - TQT_DBusConnectionPrivate(TQObject *parent = 0); + TQT_DBusConnectionPrivate(TQObject *parent = nullptr); ~TQT_DBusConnectionPrivate(); void bindToApplication(); @@ -127,7 +127,7 @@ public: struct Watcher { - Watcher(): watch(0), read(0), write(0) {} + Watcher(): watch(nullptr), read(nullptr), write(nullptr) {} DBusWatch *watch; TQSocketNotifier *read; TQSocketNotifier *write; diff --git a/src/tqdbusdata.cpp b/src/tqdbusdata.cpp index 7dc8c63..f65b820 100644 --- a/src/tqdbusdata.cpp +++ b/src/tqdbusdata.cpp @@ -177,7 +177,7 @@ TQT_DBusData::TQT_DBusData() : d(new Private()) { } -TQT_DBusData::TQT_DBusData(const TQT_DBusData& other) : d(0) +TQT_DBusData::TQT_DBusData(const TQT_DBusData& other) : d(nullptr) { d = other.d; @@ -349,7 +349,7 @@ const char* TQT_DBusData::typeName(Type type) case TQT_DBusData::Map: return "Map"; } - return 0; + return nullptr; } TQT_DBusData TQT_DBusData::fromBool(bool value) @@ -366,11 +366,11 @@ bool TQT_DBusData::toBool(bool* ok) const { if (d->type != TQT_DBusData::Bool) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return false; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.boolValue; } @@ -389,11 +389,11 @@ TQ_UINT8 TQT_DBusData::toByte(bool* ok) const { if (d->type != TQT_DBusData::Byte) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return 0; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.byteValue; } @@ -412,11 +412,11 @@ TQ_INT16 TQT_DBusData::toInt16(bool* ok) const { if (d->type != TQT_DBusData::Int16) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return 0; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.int16Value; } @@ -435,11 +435,11 @@ TQ_UINT16 TQT_DBusData::toUInt16(bool* ok) const { if (d->type != TQT_DBusData::UInt16) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return 0; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.uint16Value; } @@ -458,11 +458,11 @@ TQ_INT32 TQT_DBusData::toInt32(bool* ok) const { if (d->type != TQT_DBusData::Int32) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return 0; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.int32Value; } @@ -481,11 +481,11 @@ TQ_UINT32 TQT_DBusData::toUInt32(bool* ok) const { if (d->type != TQT_DBusData::UInt32) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return 0; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.uint32Value; } @@ -504,11 +504,11 @@ TQ_INT64 TQT_DBusData::toInt64(bool* ok) const { if (d->type != TQT_DBusData::Int64) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return 0; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.int64Value; } @@ -527,11 +527,11 @@ TQ_UINT64 TQT_DBusData::toUInt64(bool* ok) const { if (d->type != TQT_DBusData::UInt64) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return 0; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.uint64Value; } @@ -550,11 +550,11 @@ double TQT_DBusData::toDouble(bool* ok) const { if (d->type != TQT_DBusData::Double) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return 0.0; } - if (ok != 0) *ok = true; + if (ok) *ok = true; return d->value.doubleValue; } @@ -573,11 +573,11 @@ TQString TQT_DBusData::toString(bool* ok) const { if (d->type != TQT_DBusData::String) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQString(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQString*)d->value.pointer); } @@ -599,11 +599,11 @@ TQT_DBusObjectPath TQT_DBusData::toObjectPath(bool* ok) const { if (d->type != TQT_DBusData::ObjectPath) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusObjectPath(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusObjectPath*)d->value.pointer); } @@ -625,11 +625,11 @@ TQT_DBusUnixFd TQT_DBusData::toUnixFd(bool* ok) const { if (d->type != TQT_DBusData::UnixFd) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusUnixFd(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusUnixFd*)d->value.pointer); } @@ -650,11 +650,11 @@ TQT_DBusDataList TQT_DBusData::toList(bool* ok) const { if (d->type != TQT_DBusData::List) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataList(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataList*)d->value.pointer); } @@ -671,7 +671,7 @@ TQValueList TQT_DBusData::toTQValueList(bool* ok) const if (!internalOk) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -699,11 +699,11 @@ TQValueList TQT_DBusData::toStruct(bool* ok) const { if (d->type != TQT_DBusData::Struct) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQValueList*)d->value.pointer); } @@ -722,11 +722,11 @@ TQT_DBusVariant TQT_DBusData::toVariant(bool* ok) const { if (d->type != TQT_DBusData::Variant) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusVariant(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusVariant*)d->value.pointer); } @@ -754,11 +754,11 @@ TQT_DBusDataMap TQT_DBusData::toByteKeyMap(bool* ok) const { if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -778,11 +778,11 @@ TQT_DBusDataMap TQT_DBusData::toInt16KeyMap(bool* ok) const { if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -803,11 +803,11 @@ TQT_DBusDataMap TQT_DBusData::toUInt16KeyMap(bool* ok) const if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -827,11 +827,11 @@ TQT_DBusDataMap TQT_DBusData::toInt32KeyMap(bool* ok) const { if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -852,11 +852,11 @@ TQT_DBusDataMap TQT_DBusData::toUInt32KeyMap(bool* ok) const if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -876,11 +876,11 @@ TQT_DBusDataMap TQT_DBusData::toInt64KeyMap(bool* ok) const { if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -901,11 +901,11 @@ TQT_DBusDataMap TQT_DBusData::toUInt64KeyMap(bool* ok) const if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -925,11 +925,11 @@ TQT_DBusDataMap TQT_DBusData::toStringKeyMap(bool* ok) const { if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -950,11 +950,11 @@ TQT_DBusDataMap TQT_DBusData::toObjectPathKeyMap(bool* ok) c if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -975,11 +975,11 @@ TQT_DBusDataMap TQT_DBusData::toUnixFdKeyMap(bool* ok) const if (d->type != TQT_DBusData::Map && d->keyType != TQT_DBusDataMap::m_keyType) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQT_DBusDataMap(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return *((TQT_DBusDataMap*)d->value.pointer); } @@ -989,7 +989,7 @@ static const char* qDBusTypeForTQT_DBusType(TQT_DBusData::Type type) switch (type) { case TQT_DBusData::Invalid: - return 0; + return nullptr; case TQT_DBusData::Bool: return DBUS_TYPE_BOOLEAN_AS_STRING; case TQT_DBusData::Byte: @@ -1019,7 +1019,7 @@ static const char* qDBusTypeForTQT_DBusType(TQT_DBusData::Type type) default: break; } - return 0; + return nullptr; } template diff --git a/src/tqdbusdata.h b/src/tqdbusdata.h index 20c2c82..728e63d 100644 --- a/src/tqdbusdata.h +++ b/src/tqdbusdata.h @@ -421,7 +421,7 @@ public: * * @see fromBool() */ - bool toBool(bool* ok = 0) const; + bool toBool(bool* ok = nullptr) const; /** * @brief Creates a data object for the given byte (unsigned char) @p value @@ -448,7 +448,7 @@ public: * * @see fromByte() */ - TQ_UINT8 toByte(bool* ok = 0) const; + TQ_UINT8 toByte(bool* ok = nullptr) const; /** * @brief Creates a data object for the given signed 16-bit integer @p value @@ -475,7 +475,7 @@ public: * * @see fromInt16() */ - TQ_INT16 toInt16(bool* ok = 0) const; + TQ_INT16 toInt16(bool* ok = nullptr) const; /** * @brief Creates a data object for the given unsigned 16-bit integer @p value @@ -502,7 +502,7 @@ public: * * @see fromUInt16() */ - TQ_UINT16 toUInt16(bool* ok = 0) const; + TQ_UINT16 toUInt16(bool* ok = nullptr) const; /** * @brief Creates a data object for the given signed 32-bit integer @p value @@ -529,7 +529,7 @@ public: * * @see fromInt32() */ - TQ_INT32 toInt32(bool* ok = 0) const; + TQ_INT32 toInt32(bool* ok = nullptr) const; /** * @brief Creates a data object for the given unsigned 32-bit integer @p value @@ -556,7 +556,7 @@ public: * * @see fromUInt32() */ - TQ_UINT32 toUInt32(bool* ok = 0) const; + TQ_UINT32 toUInt32(bool* ok = nullptr) const; /** * @brief Creates a data object for the given signed 64-bit integer @p value @@ -583,7 +583,7 @@ public: * * @see fromInt64() */ - TQ_INT64 toInt64(bool* ok = 0) const; + TQ_INT64 toInt64(bool* ok = nullptr) const; /** * @brief Creates a data object for the given unsigned 64-bit integer @p value @@ -610,7 +610,7 @@ public: * * @see fromUInt64() */ - TQ_UINT64 toUInt64(bool* ok = 0) const; + TQ_UINT64 toUInt64(bool* ok = nullptr) const; /** * @brief Creates a data object for the given double @p value @@ -637,7 +637,7 @@ public: * * @see fromDouble() */ - double toDouble(bool* ok = 0) const; + double toDouble(bool* ok = nullptr) const; /** * @brief Creates a data object for the given string @p value @@ -664,7 +664,7 @@ public: * * @see fromString() */ - TQString toString(bool* ok = 0) const; + TQString toString(bool* ok = nullptr) const; /** * @brief Creates a data object for the given object path @p value @@ -692,7 +692,7 @@ public: * * @see fromObjectPath() */ - TQT_DBusObjectPath toObjectPath(bool* ok = 0) const; + TQT_DBusObjectPath toObjectPath(bool* ok = nullptr) const; /** * @brief Creates a data object for the given unix file handle @p value @@ -720,7 +720,7 @@ public: * * @see fromUnixFd() */ - TQT_DBusUnixFd toUnixFd(bool* ok = 0) const; + TQT_DBusUnixFd toUnixFd(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p list @@ -756,7 +756,7 @@ public: * * @see fromList() */ - TQT_DBusDataList toList(bool* ok = 0) const; + TQT_DBusDataList toList(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p list @@ -791,7 +791,7 @@ public: * * @see fromTQValueList() */ - TQValueList toTQValueList(bool* ok = 0) const; + TQValueList toTQValueList(bool* ok = nullptr) const; /** * @brief Creates a data object for the given struct's @p memberList @@ -822,7 +822,7 @@ public: * * @see fromStruct() */ - TQValueList toStruct(bool* ok = 0) const; + TQValueList toStruct(bool* ok = nullptr) const; /** * @brief Creates a data object for the given variant @p value @@ -849,7 +849,7 @@ public: * * @see fromVariant() */ - TQT_DBusVariant toVariant(bool* ok = 0) const; + TQT_DBusVariant toVariant(bool* ok = nullptr) const; /** * @brief Creates a variant from @p this object and returns it as a TQT_DBusData object @@ -891,7 +891,7 @@ public: * * @see fromByteKeyMap() */ - TQT_DBusDataMap toByteKeyMap(bool* ok = 0) const; + TQT_DBusDataMap toByteKeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -926,7 +926,7 @@ public: * * @see fromInt16KeyMap() */ - TQT_DBusDataMap toInt16KeyMap(bool* ok = 0) const; + TQT_DBusDataMap toInt16KeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -961,7 +961,7 @@ public: * * @see fromUInt16KeyMap() */ - TQT_DBusDataMap toUInt16KeyMap(bool* ok = 0) const; + TQT_DBusDataMap toUInt16KeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -996,7 +996,7 @@ public: * * @see fromInt32KeyMap() */ - TQT_DBusDataMap toInt32KeyMap(bool* ok = 0) const; + TQT_DBusDataMap toInt32KeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -1031,7 +1031,7 @@ public: * * @see fromUInt32KeyMap() */ - TQT_DBusDataMap toUInt32KeyMap(bool* ok = 0) const; + TQT_DBusDataMap toUInt32KeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -1066,7 +1066,7 @@ public: * * @see fromInt64KeyMap() */ - TQT_DBusDataMap toInt64KeyMap(bool* ok = 0) const; + TQT_DBusDataMap toInt64KeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -1101,7 +1101,7 @@ public: * * @see fromUInt64KeyMap() */ - TQT_DBusDataMap toUInt64KeyMap(bool* ok = 0) const; + TQT_DBusDataMap toUInt64KeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -1136,7 +1136,7 @@ public: * * @see fromStringKeyMap() */ - TQT_DBusDataMap toStringKeyMap(bool* ok = 0) const; + TQT_DBusDataMap toStringKeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -1171,7 +1171,7 @@ public: * * @see fromObjectPathKeyMap() */ - TQT_DBusDataMap toObjectPathKeyMap(bool* ok = 0) const; + TQT_DBusDataMap toObjectPathKeyMap(bool* ok = nullptr) const; /** * @brief Creates a data object for the given @p map @@ -1206,7 +1206,7 @@ public: * * @see fromUnixFdKeyMap() */ - TQT_DBusDataMap toUnixFdKeyMap(bool* ok = 0) const; + TQT_DBusDataMap toUnixFdKeyMap(bool* ok = nullptr) const; /** * @brief Creates the data objects D-Bus signature diff --git a/src/tqdbusdatalist.cpp b/src/tqdbusdatalist.cpp index 23f60a5..8970a12 100644 --- a/src/tqdbusdatalist.cpp +++ b/src/tqdbusdatalist.cpp @@ -498,7 +498,7 @@ TQStringList TQT_DBusDataList::toTQStringList(bool* ok) const { if (d->type != TQT_DBusData::String) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQStringList(); } @@ -511,7 +511,7 @@ TQStringList TQT_DBusDataList::toTQStringList(bool* ok) const result << (*it).toString(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -520,7 +520,7 @@ TQValueList TQT_DBusDataList::toBoolList(bool* ok) const { if (d->type != TQT_DBusData::Bool) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -533,7 +533,7 @@ TQValueList TQT_DBusDataList::toBoolList(bool* ok) const result << (*it).toBool(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -542,7 +542,7 @@ TQValueList TQT_DBusDataList::toByteList(bool* ok) const { if (d->type != TQT_DBusData::Byte) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -555,7 +555,7 @@ TQValueList TQT_DBusDataList::toByteList(bool* ok) const result << (*it).toByte(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -564,7 +564,7 @@ TQValueList TQT_DBusDataList::toInt16List(bool* ok) const { if (d->type != TQT_DBusData::Int16) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -577,7 +577,7 @@ TQValueList TQT_DBusDataList::toInt16List(bool* ok) const result << (*it).toInt16(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -586,7 +586,7 @@ TQValueList TQT_DBusDataList::toUInt16List(bool* ok) const { if (d->type != TQT_DBusData::UInt16) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -599,7 +599,7 @@ TQValueList TQT_DBusDataList::toUInt16List(bool* ok) const result << (*it).toUInt16(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -608,7 +608,7 @@ TQValueList TQT_DBusDataList::toInt32List(bool* ok) const { if (d->type != TQT_DBusData::Int32) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -621,7 +621,7 @@ TQValueList TQT_DBusDataList::toInt32List(bool* ok) const result << (*it).toInt32(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -630,7 +630,7 @@ TQValueList TQT_DBusDataList::toUInt32List(bool* ok) const { if (d->type != TQT_DBusData::UInt32) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -643,7 +643,7 @@ TQValueList TQT_DBusDataList::toUInt32List(bool* ok) const result << (*it).toUInt32(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -652,7 +652,7 @@ TQValueList TQT_DBusDataList::toInt64List(bool* ok) const { if (d->type != TQT_DBusData::Int64) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -665,7 +665,7 @@ TQValueList TQT_DBusDataList::toInt64List(bool* ok) const result << (*it).toInt64(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -674,7 +674,7 @@ TQValueList TQT_DBusDataList::toUInt64List(bool* ok) const { if (d->type != TQT_DBusData::UInt64) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -687,7 +687,7 @@ TQValueList TQT_DBusDataList::toUInt64List(bool* ok) const result << (*it).toUInt64(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -696,7 +696,7 @@ TQValueList TQT_DBusDataList::toDoubleList(bool* ok) const { if (d->type != TQT_DBusData::Double) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -709,7 +709,7 @@ TQValueList TQT_DBusDataList::toDoubleList(bool* ok) const result << (*it).toDouble(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -723,7 +723,7 @@ TQValueList TQT_DBusDataList::toObjectPathList(bool* ok) con { if (d->type != TQT_DBusData::ObjectPath) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -736,7 +736,7 @@ TQValueList TQT_DBusDataList::toObjectPathList(bool* ok) con result << (*it).toObjectPath(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -745,7 +745,7 @@ TQValueList TQT_DBusDataList::toUnixFdList(bool* ok) const { if (d->type != TQT_DBusData::UnixFd) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -758,7 +758,7 @@ TQValueList TQT_DBusDataList::toUnixFdList(bool* ok) const result << (*it).toUnixFd(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } @@ -767,7 +767,7 @@ TQValueList TQT_DBusDataList::toVariantList(bool* ok) const { if (d->type != TQT_DBusData::Variant) { - if (ok != 0) *ok = false; + if (ok) *ok = false; return TQValueList(); } @@ -780,7 +780,7 @@ TQValueList TQT_DBusDataList::toVariantList(bool* ok) const result << (*it).toVariant(); } - if (ok != 0) *ok = true; + if (ok) *ok = true; return result; } diff --git a/src/tqdbusdatalist.h b/src/tqdbusdatalist.h index bd0b467..4568aa5 100644 --- a/src/tqdbusdatalist.h +++ b/src/tqdbusdatalist.h @@ -511,7 +511,7 @@ public: * @see toStringList() * @see TQT_DBusData::toString() */ - TQStringList toTQStringList(bool* ok = 0) const; + TQStringList toTQStringList(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of bool @@ -529,7 +529,7 @@ public: * * @see TQT_DBusData::toBool() */ - TQValueList toBoolList(bool* ok = 0) const; + TQValueList toBoolList(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQ_UINT8 @@ -547,7 +547,7 @@ public: * * @see TQT_DBusData::toByte() */ - TQValueList toByteList(bool* ok = 0) const; + TQValueList toByteList(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQ_INT16 @@ -566,7 +566,7 @@ public: * * @see TQT_DBusData::toInt16() */ - TQValueList toInt16List(bool* ok = 0) const; + TQValueList toInt16List(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQ_UINT16 @@ -585,7 +585,7 @@ public: * * @see TQT_DBusData::toUInt16() */ - TQValueList toUInt16List(bool* ok = 0) const; + TQValueList toUInt16List(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQ_INT32 @@ -604,7 +604,7 @@ public: * * @see TQT_DBusData::toInt32() */ - TQValueList toInt32List(bool* ok = 0) const; + TQValueList toInt32List(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQ_UINT32 @@ -623,7 +623,7 @@ public: * * @see TQT_DBusData::toUInt32() */ - TQValueList toUInt32List(bool* ok = 0) const; + TQValueList toUInt32List(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQ_INT64 @@ -642,7 +642,7 @@ public: * * @see TQT_DBusData::toInt64() */ - TQValueList toInt64List(bool* ok = 0) const; + TQValueList toInt64List(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQ_UINT64 @@ -661,7 +661,7 @@ public: * * @see TQT_DBusData::toUInt64() */ - TQValueList toUInt64List(bool* ok = 0) const; + TQValueList toUInt64List(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of double @@ -679,7 +679,7 @@ public: * * @see TQT_DBusData::toDouble() */ - TQValueList toDoubleList(bool* ok = 0) const; + TQValueList toDoubleList(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQString @@ -697,7 +697,7 @@ public: * * @see TQT_DBusData::toString() */ - TQValueList toStringList(bool* ok = 0) const; + TQValueList toStringList(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of object paths @@ -712,7 +712,7 @@ public: * * @see TQT_DBusData::toObjectPath() */ - TQValueList toObjectPathList(bool* ok = 0) const; + TQValueList toObjectPathList(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQT_DBusVariant @@ -730,7 +730,7 @@ public: * * @see TQT_DBusData::toVariant() */ - TQValueList toVariantList(bool* ok = 0) const; + TQValueList toVariantList(bool* ok = nullptr) const; /** * @brief Tries to get the list object's elements as a TQValueList of TQT_DBusUnixFd @@ -748,7 +748,7 @@ public: * * @see TQT_DBusData::toUnixFd() */ - TQValueList toUnixFdList(bool* ok = 0) const; + TQValueList toUnixFdList(bool* ok = nullptr) const; private: class Private; diff --git a/src/tqdbusintegrator.cpp b/src/tqdbusintegrator.cpp index 32be3af..9200fca 100644 --- a/src/tqdbusintegrator.cpp +++ b/src/tqdbusintegrator.cpp @@ -181,14 +181,14 @@ static void qDBusRemoveWatch(DBusWatch *watch, void *data) if ((*wit).read) { (*wit).read->disconnect(d); - (*wit).read = 0; + (*wit).read = nullptr; } if ((*wit).write) { (*wit).write->disconnect(d); - (*wit).write = 0; + (*wit).write = nullptr; } - (*wit).watch = 0; + (*wit).watch = nullptr; } } } @@ -272,8 +272,8 @@ int TQT_DBusConnectionPrivate::registerMessageMetaType() } TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *parent) - : TQObject(parent), ref(1), mode(InvalidMode), connection(0), server(0), - dispatcher(0), inDispatch(false) + : TQObject(parent), ref(1), mode(InvalidMode), connection(nullptr), server(nullptr), + dispatcher(nullptr), inDispatch(false) { static const int msgType = registerMessageMetaType(); Q_UNUSED(msgType); @@ -315,7 +315,7 @@ void TQT_DBusConnectionPrivate::closeConnection() if (server) { dbus_server_disconnect(server); dbus_server_unref(server); - server = 0; + server = nullptr; } } else if (oldMode == ClientMode) { if (connection) { @@ -326,7 +326,7 @@ void TQT_DBusConnectionPrivate::closeConnection() while (dbus_connection_dispatch(connection) == DBUS_DISPATCH_DATA_REMAINS); #endif dbus_connection_unref(connection); - connection = 0; + connection = nullptr; } } } @@ -430,7 +430,7 @@ void TQT_DBusConnectionPrivate::objectDestroyed(TQObject* object) for (PendingCallMap::iterator it = pendingCalls.begin(); it != pendingCalls.end();) { TQObject* receiver = (TQObject*) it.data()->receiver; - if (receiver == object || receiver == 0) + if (receiver == object || receiver == nullptr) { PendingCallMap::iterator copyIt = it; ++it; @@ -563,12 +563,12 @@ void TQT_DBusConnectionPrivate::setServer(DBusServer *s) return; dbus_server_set_watch_functions(server, qDBusAddWatch, qDBusRemoveWatch, - qDBusToggleWatch, this, 0); // ### check return type? + qDBusToggleWatch, this, nullptr); // ### check return type? dbus_server_set_timeout_functions(server, qDBusAddTimeout, qDBusRemoveTimeout, - qDBusToggleTimeout, this, 0); - dbus_server_set_new_connection_function(server, qDBusNewConnection, this, 0); + qDBusToggleTimeout, this, nullptr); + dbus_server_set_new_connection_function(server, qDBusNewConnection, this, nullptr); - dbus_server_set_data(server, server_slot, this, 0); + dbus_server_set_data(server, server_slot, this, nullptr); } void TQT_DBusConnectionPrivate::setConnection(DBusConnection *dbc) @@ -583,9 +583,9 @@ void TQT_DBusConnectionPrivate::setConnection(DBusConnection *dbc) dbus_connection_set_exit_on_disconnect(connection, false); dbus_connection_set_watch_functions(connection, qDBusAddWatch, qDBusRemoveWatch, - qDBusToggleWatch, this, 0); + qDBusToggleWatch, this, nullptr); dbus_connection_set_timeout_functions(connection, qDBusAddTimeout, qDBusRemoveTimeout, - qDBusToggleTimeout, this, 0); + qDBusToggleTimeout, this, nullptr); dbus_bus_add_match(connection, "type='signal'", &error); if (handleError()) { @@ -609,7 +609,7 @@ void TQT_DBusConnectionPrivate::setConnection(DBusConnection *dbc) tqWarning("TQT_DBusConnectionPrivate::SetConnection: Unable to get unique name"); } - dbus_connection_add_filter(connection, qDBusSignalFilter, this, 0); + dbus_connection_add_filter(connection, qDBusSignalFilter, this, nullptr); //tqDebug("unique name: %s", service); } @@ -659,7 +659,7 @@ int TQT_DBusConnectionPrivate::sendWithReplyAsync(const TQT_DBusMessage &message return 0; int msg_serial = 0; - DBusPendingCall *pending = 0; + DBusPendingCall *pending = nullptr; if (dbus_connection_send_with_reply(connection, msg, &pending, message.timeout())) { TQT_DBusPendingCall *pcall = new TQT_DBusPendingCall; pcall->receiver = receiver; @@ -667,7 +667,7 @@ int TQT_DBusConnectionPrivate::sendWithReplyAsync(const TQT_DBusMessage &message pcall->pending = pending; pendingCalls.insert(pcall->pending, pcall); - dbus_pending_call_set_notify(pending, qDBusResultReceived, this, 0); + dbus_pending_call_set_notify(pending, qDBusResultReceived, this, nullptr); msg_serial = dbus_message_get_serial(msg); } diff --git a/src/tqdbusmarshall.cpp b/src/tqdbusmarshall.cpp index fc73602..fb8c1b0 100644 --- a/src/tqdbusmarshall.cpp +++ b/src/tqdbusmarshall.cpp @@ -667,7 +667,7 @@ static const char* qDBusTypeForTQT_DBusType(TQT_DBusData::Type type) switch (type) { case TQT_DBusData::Invalid: - return 0; + return nullptr; case TQT_DBusData::Bool: return DBUS_TYPE_BOOLEAN_AS_STRING; @@ -717,7 +717,7 @@ static const char* qDBusTypeForTQT_DBusType(TQT_DBusData::Type type) case TQT_DBusData::UnixFd: return DBUS_TYPE_UNIX_FD_AS_STRING; } - return 0; + return nullptr; } static void qDBusDataToIterator(DBusMessageIter* it, const TQT_DBusData& var); @@ -745,7 +745,7 @@ static void qDBusByteKeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& v { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); dbus_message_iter_append_basic(it, DBUS_TYPE_BYTE, &(mit.key())); qDBusDataToIterator(&itemIterator, mit.data()); @@ -779,7 +779,7 @@ static void qDBusInt16KeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); dbus_message_iter_append_basic(it, DBUS_TYPE_INT16, &(mit.key())); qDBusDataToIterator(&itemIterator, mit.data()); @@ -813,7 +813,7 @@ static void qDBusUInt16KeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); dbus_message_iter_append_basic(it, DBUS_TYPE_UINT16, &(mit.key())); qDBusDataToIterator(&itemIterator, mit.data()); @@ -847,7 +847,7 @@ static void qDBusInt32KeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); dbus_message_iter_append_basic(it, DBUS_TYPE_INT32, &(mit.key())); qDBusDataToIterator(&itemIterator, mit.data()); @@ -881,7 +881,7 @@ static void qDBusUInt32KeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); dbus_message_iter_append_basic(it, DBUS_TYPE_UINT32, &(mit.key())); qDBusDataToIterator(&itemIterator, mit.data()); @@ -915,7 +915,7 @@ static void qDBusInt64KeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); dbus_message_iter_append_basic(it, DBUS_TYPE_INT64, &(mit.key())); qDBusDataToIterator(&itemIterator, mit.data()); @@ -949,7 +949,7 @@ static void qDBusUInt64KeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); dbus_message_iter_append_basic(it, DBUS_TYPE_UINT64, &(mit.key())); qDBusDataToIterator(&itemIterator, mit.data()); @@ -983,7 +983,7 @@ static void qDBusStringKeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); tqAppendToMessage(&itemIterator, mit.key()); qDBusDataToIterator(&itemIterator, mit.data()); @@ -1018,7 +1018,7 @@ static void qDBusObjectPathKeyMapToIterator(DBusMessageIter* it, { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); tqAppendToMessage(&itemIterator, mit.key()); qDBusDataToIterator(&itemIterator, mit.data()); @@ -1052,7 +1052,7 @@ static void qDBusUnixFdKeyMapToIterator(DBusMessageIter* it, const TQT_DBusData& { DBusMessageIter itemIterator; dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, - 0, &itemIterator); + nullptr, &itemIterator); dbus_message_iter_append_basic(it, DBUS_TYPE_UNIX_FD, &(mit.key())); qDBusDataToIterator(&itemIterator, mit.data()); diff --git a/src/tqdbusmessage.cpp b/src/tqdbusmessage.cpp index 455e549..5d5cccc 100644 --- a/src/tqdbusmessage.cpp +++ b/src/tqdbusmessage.cpp @@ -32,7 +32,7 @@ #include "tqdbusmessage_p.h" TQT_DBusMessagePrivate::TQT_DBusMessagePrivate(TQT_DBusMessage *qq) - : msg(0), reply(0), q(qq), type(DBUS_MESSAGE_TYPE_INVALID), timeout(-1), ref(1) + : msg(nullptr), reply(nullptr), q(qq), type(DBUS_MESSAGE_TYPE_INVALID), timeout(-1), ref(1) { } @@ -133,7 +133,7 @@ TQT_DBusMessage &TQT_DBusMessage::operator=(const TQT_DBusMessage &other) DBusMessage *TQT_DBusMessage::toDBusMessage() const { - DBusMessage *msg = 0; + DBusMessage *msg = nullptr; switch (d->type) { case DBUS_MESSAGE_TYPE_METHOD_CALL: msg = dbus_message_new_method_call(d->service.utf8().data(), @@ -153,7 +153,7 @@ DBusMessage *TQT_DBusMessage::toDBusMessage() const break; } if (!msg) - return 0; + return nullptr; TQT_DBusMarshall::listToMessage(*this, msg); return msg; diff --git a/src/tqdbusproxy.h b/src/tqdbusproxy.h index 0a51d09..eab6471 100644 --- a/src/tqdbusproxy.h +++ b/src/tqdbusproxy.h @@ -248,7 +248,7 @@ public: * @param parent TQObject parent * @param name TQObject name */ - TQT_DBusProxy(TQObject* parent = 0, const char* name = 0); + TQT_DBusProxy(TQObject* parent = nullptr, const char* name = nullptr); /** * @brief Creates a proxy on a given connection without binding it to a @@ -265,8 +265,8 @@ public: * @param parent TQObject parent * @param name TQObject name */ - TQT_DBusProxy(const TQT_DBusConnection& connection, TQObject* parent = 0, - const char* name = 0); + TQT_DBusProxy(const TQT_DBusConnection& connection, TQObject* parent = nullptr, + const char* name = nullptr); /** * @brief Creates a proxy for a given peer on a given connection @@ -284,7 +284,7 @@ public: */ TQT_DBusProxy(const TQString& service, const TQString& path, const TQString& interface, const TQT_DBusConnection& connection, - TQObject* parent = 0, const char* name = 0); + TQObject* parent = nullptr, const char* name = nullptr); /** * @brief Destroys the proxy instance @@ -465,7 +465,7 @@ public: * @see @ref dbusconventions-membername */ TQT_DBusMessage sendWithReply(const TQString& method, - const TQValueList& params, TQT_DBusError* error = 0) const; + const TQValueList& params, TQT_DBusError* error = nullptr) const; /** * @brief Sends a method call to the peer object but does not wait for an diff --git a/src/tqdbusserver.h b/src/tqdbusserver.h index 937db9f..7e85c07 100644 --- a/src/tqdbusserver.h +++ b/src/tqdbusserver.h @@ -38,7 +38,7 @@ class TQDBUS_EXPORT TQT_DBusServer: public TQObject TQ_OBJECT public: - TQT_DBusServer(const TQString &address, TQObject *parent = 0); + TQT_DBusServer(const TQString &address, TQObject *parent = nullptr); bool isConnected() const; TQT_DBusError lastError() const; diff --git a/src/tqdbusunixfd.cpp b/src/tqdbusunixfd.cpp index 3aa4ba2..572ea51 100644 --- a/src/tqdbusunixfd.cpp +++ b/src/tqdbusunixfd.cpp @@ -35,7 +35,7 @@ TQT_DBusUnixFd::TQT_DBusUnixFd(const TQT_DBusUnixFd& other) : d(other.d) d->ref(); } -TQT_DBusUnixFd::TQT_DBusUnixFd(int other) : d(0) +TQT_DBusUnixFd::TQT_DBusUnixFd(int other) : d(nullptr) { setFileDescriptor(other); } -- cgit v1.2.3