diff options
author | Alexander Akulich <akulichalexander@gmail.com> | 2019-11-08 23:14:14 +0300 |
---|---|---|
committer | Alexander Akulich <akulichalexander@gmail.com> | 2019-11-09 01:09:12 +0300 |
commit | e1d3d387a4f3cf0561a2b1da5f4fac3d462bb88d (patch) | |
tree | de86b221ce9c0872442d1f5b5d518e417ccf8dba | |
parent | 985e9f1f1389eb2cad59cfc513e638d52f9073ed (diff) |
Remove pointless immutableProperties() implementations
-rw-r--r-- | TelepathyQt/base-call.cpp | 28 | ||||
-rw-r--r-- | TelepathyQt/base-call.h | 4 | ||||
-rw-r--r-- | TelepathyQt/base-channel.cpp | 96 | ||||
-rw-r--r-- | TelepathyQt/base-channel.h | 14 | ||||
-rw-r--r-- | TelepathyQt/base-connection.cpp | 127 | ||||
-rw-r--r-- | TelepathyQt/base-connection.h | 20 | ||||
-rw-r--r-- | TelepathyQt/base-protocol.cpp | 14 | ||||
-rw-r--r-- | TelepathyQt/base-protocol.h | 2 |
8 files changed, 0 insertions, 305 deletions
diff --git a/TelepathyQt/base-call.cpp b/TelepathyQt/base-call.cpp index 2d7d151c..8e0f088c 100644 --- a/TelepathyQt/base-call.cpp +++ b/TelepathyQt/base-call.cpp @@ -321,20 +321,6 @@ BaseCallMuteInterface::~BaseCallMuteInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseCallMuteInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseCallMuteInterface::createAdaptor() { (void) new Service::CallInterfaceMuteAdaptor(dbusObject()->dbusConnection(), @@ -478,20 +464,6 @@ BaseCallContentDTMFInterface::~BaseCallContentDTMFInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseCallContentDTMFInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseCallContentDTMFInterface::createAdaptor() { (void) new Service::CallContentInterfaceDTMFAdaptor(dbusObject()->dbusConnection(), diff --git a/TelepathyQt/base-call.h b/TelepathyQt/base-call.h index 4d8baeb2..81144c57 100644 --- a/TelepathyQt/base-call.h +++ b/TelepathyQt/base-call.h @@ -121,8 +121,6 @@ public: } virtual ~BaseCallMuteInterface(); - QVariantMap immutableProperties() const; - Tp::LocalMuteState localMuteState() const; void setMuteState(const Tp::LocalMuteState &state); @@ -157,8 +155,6 @@ public: } virtual ~BaseCallContentDTMFInterface(); - QVariantMap immutableProperties() const; - bool currentlySendingTones() const; void setCurrentlySendingTones(bool sendingTones); diff --git a/TelepathyQt/base-channel.cpp b/TelepathyQt/base-channel.cpp index 04683571..984d8928 100644 --- a/TelepathyQt/base-channel.cpp +++ b/TelepathyQt/base-channel.cpp @@ -451,19 +451,6 @@ BaseChannelTextType::~BaseChannelTextType() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseChannelTextType::immutableProperties() const -{ - return QVariantMap(); -} - void BaseChannelTextType::createAdaptor() { (void) new Service::ChannelTypeTextAdaptor(dbusObject()->dbusConnection(), @@ -2549,20 +2536,6 @@ BaseChannelChatStateInterface::~BaseChannelChatStateInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseChannelChatStateInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - Tp::ChatStateMap BaseChannelChatStateInterface::chatStates() const { return mPriv->chatStates; @@ -2869,19 +2842,6 @@ void BaseChannelGroupInterface::setBaseChannel(BaseChannel *channel) } /** - * Return the immutable properties of this interface. - * - * There is no immutable properties presented on the interface. - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseChannelGroupInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - -/** * Return the flags on this channel. * * The user interface can use this property to present information about which operations @@ -3639,20 +3599,6 @@ BaseChannelRoomConfigInterface::~BaseChannelRoomConfigInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseChannelRoomConfigInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - bool BaseChannelRoomConfigInterface::anonymous() const { return mPriv->anonymous; @@ -4246,20 +4192,6 @@ BaseChannelHoldInterface::~BaseChannelHoldInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseChannelHoldInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseChannelHoldInterface::createAdaptor() { (void) new Service::ChannelInterfaceHoldAdaptor(dbusObject()->dbusConnection(), @@ -4334,20 +4266,6 @@ BaseChannelMergeableConferenceInterface::~BaseChannelMergeableConferenceInterfac delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseChannelMergeableConferenceInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseChannelMergeableConferenceInterface::createAdaptor() { (void) new Service::ChannelInterfaceMergeableConferenceAdaptor(dbusObject()->dbusConnection(), @@ -4422,20 +4340,6 @@ BaseChannelSplittableInterface::~BaseChannelSplittableInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseChannelSplittableInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseChannelSplittableInterface::createAdaptor() { (void) new Service::ChannelInterfaceSplittableAdaptor(dbusObject()->dbusConnection(), diff --git a/TelepathyQt/base-channel.h b/TelepathyQt/base-channel.h index 7e3bb854..187b7be9 100644 --- a/TelepathyQt/base-channel.h +++ b/TelepathyQt/base-channel.h @@ -133,8 +133,6 @@ public: virtual ~BaseChannelTextType(); - QVariantMap immutableProperties() const; - typedef Callback1<void, QString> MessageAcknowledgedCallback; void setMessageAcknowledgedCallback(const MessageAcknowledgedCallback &cb); @@ -585,8 +583,6 @@ public: virtual ~BaseChannelChatStateInterface(); - QVariantMap immutableProperties() const; - Tp::ChatStateMap chatStates() const; void setChatStates(const Tp::ChatStateMap &chatStates); @@ -628,8 +624,6 @@ public: virtual ~BaseChannelGroupInterface(); - QVariantMap immutableProperties() const; - Tp::ChannelGroupFlags groupFlags() const; void setGroupFlags(const Tp::ChannelGroupFlags &flags); @@ -752,8 +746,6 @@ public: virtual ~BaseChannelRoomConfigInterface(); - QVariantMap immutableProperties() const; - bool anonymous() const; void setAnonymous(bool anonymous); @@ -937,8 +929,6 @@ public: } virtual ~BaseChannelHoldInterface(); - QVariantMap immutableProperties() const; - Tp::LocalHoldState getHoldState() const; Tp::LocalHoldStateReason getHoldReason() const; void setHoldState(const Tp::LocalHoldState &state, const Tp::LocalHoldStateReason &reason); @@ -974,8 +964,6 @@ public: } virtual ~BaseChannelMergeableConferenceInterface(); - QVariantMap immutableProperties() const; - void merge(const QDBusObjectPath &channel); typedef Callback2<void, const QDBusObjectPath&, DBusError*> MergeCallback; @@ -1007,8 +995,6 @@ public: } virtual ~BaseChannelSplittableInterface(); - QVariantMap immutableProperties() const; - void split(); typedef Callback1<void, DBusError*> SplitCallback; diff --git a/TelepathyQt/base-connection.cpp b/TelepathyQt/base-connection.cpp index 1ca30844..0421eaf0 100644 --- a/TelepathyQt/base-connection.cpp +++ b/TelepathyQt/base-connection.cpp @@ -1175,21 +1175,6 @@ BaseConnectionSimplePresenceInterface::~BaseConnectionSimplePresenceInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionSimplePresenceInterface::immutableProperties() const -{ - QVariantMap map; - //FIXME - return map; -} - void BaseConnectionSimplePresenceInterface::createAdaptor() { (void) new Service::ConnectionInterfaceSimplePresenceAdaptor(dbusObject()->dbusConnection(), @@ -1489,20 +1474,6 @@ BaseConnectionContactListInterface::~BaseConnectionContactListInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionContactListInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - uint BaseConnectionContactListInterface::contactListState() const { return mPriv->contactListState; @@ -1817,20 +1788,6 @@ BaseConnectionContactGroupsInterface::~BaseConnectionContactGroupsInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionContactGroupsInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - bool BaseConnectionContactGroupsInterface::disjointGroups() const { return mPriv->disjointGroups; @@ -2090,20 +2047,6 @@ BaseConnectionContactInfoInterface::~BaseConnectionContactInfoInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionContactInfoInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - Tp::ContactInfoFlags BaseConnectionContactInfoInterface::contactInfoFlags() const { return mPriv->contactInfoFlags; @@ -2236,20 +2179,6 @@ BaseConnectionAddressingInterface::~BaseConnectionAddressingInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionAddressingInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseConnectionAddressingInterface::createAdaptor() { (void) new Service::ConnectionInterfaceAddressingAdaptor(dbusObject()->dbusConnection(), @@ -2412,20 +2341,6 @@ BaseConnectionAliasingInterface::~BaseConnectionAliasingInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionAliasingInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseConnectionAliasingInterface::createAdaptor() { (void) new Service::ConnectionInterfaceAliasingAdaptor(dbusObject()->dbusConnection(), @@ -2637,20 +2552,6 @@ BaseConnectionAvatarsInterface::~BaseConnectionAvatarsInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionAvatarsInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - AvatarSpec BaseConnectionAvatarsInterface::avatarDetails() const { return mPriv->avatarDetails; @@ -2807,20 +2708,6 @@ BaseConnectionClientTypesInterface::~BaseConnectionClientTypesInterface() delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionClientTypesInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseConnectionClientTypesInterface::createAdaptor() { (void) new Tp::Service::ConnectionInterfaceClientTypesAdaptor(dbusObject()->dbusConnection(), @@ -2934,20 +2821,6 @@ BaseConnectionContactCapabilitiesInterface::~BaseConnectionContactCapabilitiesIn delete mPriv; } -/** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseConnectionContactCapabilitiesInterface::immutableProperties() const -{ - QVariantMap map; - return map; -} - void BaseConnectionContactCapabilitiesInterface::createAdaptor() { (void) new Tp::Service::ConnectionInterfaceContactCapabilitiesAdaptor(dbusObject()->dbusConnection(), diff --git a/TelepathyQt/base-connection.h b/TelepathyQt/base-connection.h index 9bdc6319..05566c50 100644 --- a/TelepathyQt/base-connection.h +++ b/TelepathyQt/base-connection.h @@ -260,8 +260,6 @@ public: virtual ~BaseConnectionSimplePresenceInterface(); - QVariantMap immutableProperties() const; - Tp::SimpleStatusSpecMap statuses() const; void setStatuses(const Tp::SimpleStatusSpecMap &statuses); @@ -307,8 +305,6 @@ public: virtual ~BaseConnectionContactListInterface(); - QVariantMap immutableProperties() const; - uint contactListState() const; void setContactListState(uint contactListState); @@ -386,8 +382,6 @@ public: virtual ~BaseConnectionContactGroupsInterface(); - QVariantMap immutableProperties() const; - bool disjointGroups() const; void setDisjointGroups(bool disjointGroups); @@ -458,8 +452,6 @@ public: virtual ~BaseConnectionContactInfoInterface(); - QVariantMap immutableProperties() const; - Tp::ContactInfoFlags contactInfoFlags() const; void setContactInfoFlags(const Tp::ContactInfoFlags &contactInfoFlags); @@ -514,10 +506,6 @@ public: virtual ~BaseConnectionAddressingInterface(); - QVariantMap immutableProperties() const; - - - typedef Callback6 < void, const QString&, const QStringList&, const QStringList&, Tp::AddressingNormalizationMap&, Tp::ContactAttributesMap&, DBusError* > GetContactsByVCardFieldCallback; void setGetContactsByVCardFieldCallback(const GetContactsByVCardFieldCallback &cb); @@ -558,8 +546,6 @@ public: virtual ~BaseConnectionAliasingInterface(); - QVariantMap immutableProperties() const; - typedef Callback1<Tp::ConnectionAliasFlags, DBusError*> GetAliasFlagsCallback; void setGetAliasFlagsCallback(const GetAliasFlagsCallback &cb); Tp::ConnectionAliasFlags getAliasFlags(DBusError *error); @@ -610,8 +596,6 @@ public: virtual ~BaseConnectionAvatarsInterface(); - QVariantMap immutableProperties() const; - AvatarSpec avatarDetails() const; void setAvatarDetails(const AvatarSpec &spec); @@ -666,8 +650,6 @@ public: virtual ~BaseConnectionClientTypesInterface(); - QVariantMap immutableProperties() const; - typedef Callback2<Tp::ContactClientTypes, const Tp::UIntList &, DBusError*> GetClientTypesCallback; void setGetClientTypesCallback(const GetClientTypesCallback &cb); Tp::ContactClientTypes getClientTypes(const Tp::UIntList &contacts, DBusError *error); @@ -710,8 +692,6 @@ public: virtual ~BaseConnectionContactCapabilitiesInterface(); - QVariantMap immutableProperties() const; - typedef Callback2<void, const Tp::HandlerCapabilitiesList &, DBusError*> UpdateCapabilitiesCallback; void setUpdateCapabilitiesCallback(const UpdateCapabilitiesCallback &cb); void updateCapabilities(const Tp::HandlerCapabilitiesList &handlerCapabilities, DBusError *error); diff --git a/TelepathyQt/base-protocol.cpp b/TelepathyQt/base-protocol.cpp index 70120f22..f2b2fa25 100644 --- a/TelepathyQt/base-protocol.cpp +++ b/TelepathyQt/base-protocol.cpp @@ -814,20 +814,6 @@ BaseProtocolAddressingInterface::~BaseProtocolAddressingInterface() } /** - * Return the immutable properties of this interface. - * - * Immutable properties cannot change after the interface has been registered - * on a service on the bus with registerInterface(). - * - * \return The immutable properties of this interface. - */ -QVariantMap BaseProtocolAddressingInterface::immutableProperties() const -{ - // no immutable property - return QVariantMap(); -} - -/** * Return the list of addressable vcard fields that have been set with * setAddressableVCardFields(). * diff --git a/TelepathyQt/base-protocol.h b/TelepathyQt/base-protocol.h index 39016f42..6a3d3f9b 100644 --- a/TelepathyQt/base-protocol.h +++ b/TelepathyQt/base-protocol.h @@ -166,8 +166,6 @@ public: virtual ~BaseProtocolAddressingInterface(); - QVariantMap immutableProperties() const; - QStringList addressableVCardFields() const; void setAddressableVCardFields(const QStringList &vcardFields); |