[telepathy-qt4/master] OptionalInterfaceFactory: Moved InterfaceSupportedChecking enum to OptionalInterfaceFactory.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Sun Jun 21 21:18:13 PDT 2009
Continue preparation for moving optionalInterface method to OptionalInterfaceFactory.
---
TelepathyQt4/dbus-proxy.h | 7 -------
TelepathyQt4/optional-interface-factory.h | 6 ++++++
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/TelepathyQt4/dbus-proxy.h b/TelepathyQt4/dbus-proxy.h
index 448b4fd..458c1d8 100644
--- a/TelepathyQt4/dbus-proxy.h
+++ b/TelepathyQt4/dbus-proxy.h
@@ -42,13 +42,6 @@ class DBusProxy : public QObject
public:
DBusProxy(const QDBusConnection &dbusConnection, const QString &busName,
const QString &objectPath, QObject *parent = 0);
-
- enum InterfaceSupportedChecking
- {
- CheckInterfaceSupported,
- BypassInterfaceCheck
- };
-
virtual ~DBusProxy();
QDBusConnection dbusConnection() const;
diff --git a/TelepathyQt4/optional-interface-factory.h b/TelepathyQt4/optional-interface-factory.h
index d33d048..aa8544d 100644
--- a/TelepathyQt4/optional-interface-factory.h
+++ b/TelepathyQt4/optional-interface-factory.h
@@ -58,6 +58,12 @@ template <typename DBusProxySubclass> class OptionalInterfaceFactory
: private OptionalInterfaceCache
{
public:
+ enum InterfaceSupportedChecking
+ {
+ CheckInterfaceSupported,
+ BypassInterfaceCheck
+ };
+
inline OptionalInterfaceFactory(DBusProxySubclass *this_)
: OptionalInterfaceCache(this_)
{
--
1.5.6.5
More information about the telepathy-commits
mailing list