[Telepathy-commits] [telepathy-qt4/master] Weed out includes in DBusProxy (Uninlines DBusProxy::invalidate(QDBusError))
Olli Salli
olli.salli at collabora.co.uk
Thu Jan 29 11:37:40 PST 2009
---
TelepathyQt4/Client/dbus-proxy.cpp | 8 ++++++++
TelepathyQt4/Client/dbus-proxy.h | 13 +++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index 72ff01e..e2a7903 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -28,7 +28,10 @@
#include <TelepathyQt4/Constants>
#include <QTimer>
+
+#include <QDBusConnection>
#include <QDBusConnectionInterface>
+#include <QDBusError>
namespace Telepathy
{
@@ -234,6 +237,11 @@ void DBusProxy::invalidate(const QString &reason, const QString &message)
QTimer::singleShot(0, this, SLOT(emitInvalidated()));
}
+void DBusProxy::invalidate(const QDBusError &error)
+{
+ invalidate(error.name(), error.message());
+}
+
void DBusProxy::emitInvalidated()
{
Q_ASSERT(!isValid());
diff --git a/TelepathyQt4/Client/dbus-proxy.h b/TelepathyQt4/Client/dbus-proxy.h
index bb2294a..2a84b0c 100644
--- a/TelepathyQt4/Client/dbus-proxy.h
+++ b/TelepathyQt4/Client/dbus-proxy.h
@@ -26,8 +26,10 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <QDBusConnection>
-#include <QDBusError>
+#include <QObject>
+
+class QDBusConnection;
+class QDBusError;
namespace Telepathy
{
@@ -62,7 +64,7 @@ public:
protected:
void setBusName(const QString &busName);
void invalidate(const QString &reason, const QString &message);
- inline void invalidate(const QDBusError &error);
+ void invalidate(const QDBusError &error);
Q_SIGNALS:
void invalidated(Telepathy::Client::DBusProxy *proxy,
@@ -115,11 +117,6 @@ private:
Private *mPriv;
};
-void DBusProxy::invalidate(const QDBusError &error)
-{
- invalidate(error.name(), error.message());
-}
-
}
}
--
1.5.6.5
More information about the telepathy-commits
mailing list