[telepathy-qt4/master] ClientRegistrar: Changed Observer/Approver/Handler channelFilter method to avoid conflicts when using multiple inheritance.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Fri May 15 06:56:26 PDT 2009
---
TelepathyQt4/abstract-client.cpp | 12 +++++++++++-
TelepathyQt4/abstract-client.h | 6 +++---
TelepathyQt4/client-registrar-internal.h | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/TelepathyQt4/abstract-client.cpp b/TelepathyQt4/abstract-client.cpp
index fe039f0..9ece688 100644
--- a/TelepathyQt4/abstract-client.cpp
+++ b/TelepathyQt4/abstract-client.cpp
@@ -53,6 +53,11 @@ AbstractClientObserver::~AbstractClientObserver()
delete mPriv;
}
+ChannelClassList AbstractClientObserver::observerChannelFilter() const
+{
+ return mPriv->channelFilter;
+}
+
struct AbstractClientApprover::Private
{
ChannelClassList channelFilter;
@@ -70,6 +75,11 @@ AbstractClientApprover::~AbstractClientApprover()
delete mPriv;
}
+ChannelClassList AbstractClientApprover::approverChannelFilter() const
+{
+ return mPriv->channelFilter;
+}
+
struct AbstractClientHandler::Private
{
ChannelClassList channelFilter;
@@ -89,7 +99,7 @@ AbstractClientHandler::~AbstractClientHandler()
delete mPriv;
}
-ChannelClassList AbstractClientHandler::channelFilter() const
+ChannelClassList AbstractClientHandler::handlerChannelFilter() const
{
return mPriv->channelFilter;
}
diff --git a/TelepathyQt4/abstract-client.h b/TelepathyQt4/abstract-client.h
index b13daca..40a149c 100644
--- a/TelepathyQt4/abstract-client.h
+++ b/TelepathyQt4/abstract-client.h
@@ -53,7 +53,7 @@ class AbstractClientObserver : public virtual AbstractClient
public:
virtual ~AbstractClientObserver();
- ChannelClassList channelFilter() const;
+ ChannelClassList observerChannelFilter() const;
/* TODO add more methods */
@@ -73,7 +73,7 @@ class AbstractClientApprover : public virtual AbstractClient
public:
virtual ~AbstractClientApprover();
- ChannelClassList channelFilter() const;
+ ChannelClassList approverChannelFilter() const;
/* TODO add more methods */
@@ -93,7 +93,7 @@ class AbstractClientHandler : public virtual AbstractClient
public:
virtual ~AbstractClientHandler();
- ChannelClassList channelFilter() const;
+ ChannelClassList handlerChannelFilter() const;
virtual bool bypassApproval() const = 0;
virtual void handleChannels(const MethodInvocationContextPtr<> &context,
diff --git a/TelepathyQt4/client-registrar-internal.h b/TelepathyQt4/client-registrar-internal.h
index c51ad49..8ef6613 100644
--- a/TelepathyQt4/client-registrar-internal.h
+++ b/TelepathyQt4/client-registrar-internal.h
@@ -94,7 +94,7 @@ public:
public: // Properties
inline Tp::ChannelClassList HandlerChannelFilter() const
{
- return mClient->channelFilter();
+ return mClient->handlerChannelFilter();
}
inline bool BypassApproval() const
--
1.5.6.5
More information about the telepathy-commits
mailing list