[Telepathy-commits] [telepathy-qt4/master] Weed out includes in PendingHandles

Olli Salli olli.salli at collabora.co.uk
Thu Jan 29 11:56:37 PST 2009


---
 TelepathyQt4/Client/pending-handles.cpp |    5 ++++-
 TelepathyQt4/Client/pending-handles.h   |   11 +++++++----
 tests/dbus/conn-requests.cpp            |    1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/TelepathyQt4/Client/pending-handles.cpp b/TelepathyQt4/Client/pending-handles.cpp
index 2ba663c..d578097 100644
--- a/TelepathyQt4/Client/pending-handles.cpp
+++ b/TelepathyQt4/Client/pending-handles.cpp
@@ -22,7 +22,10 @@
 #include <TelepathyQt4/Client/PendingHandles>
 #include "_gen/pending-handles.moc.hpp"
 
-#include "../debug-internal.h"
+#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Client/ReferencedHandles>
+
+#include "TelepathyQt4/debug-internal.h"
 
 namespace Telepathy
 {
diff --git a/TelepathyQt4/Client/pending-handles.h b/TelepathyQt4/Client/pending-handles.h
index 7aa6265..0aeb38d 100644
--- a/TelepathyQt4/Client/pending-handles.h
+++ b/TelepathyQt4/Client/pending-handles.h
@@ -53,17 +53,20 @@ class PendingHandles;
 }
 }
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Connection>
 #include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/ReferencedHandles>
+
+#include <QStringList>
+
+#include <TelepathyQt4/Types>
 
 namespace Telepathy
 {
 namespace Client
 {
 
+class Connection;
+class ReferencedHandles;
+
 /**
  * \class PendingHandles
  * \ingroup clientconn
diff --git a/tests/dbus/conn-requests.cpp b/tests/dbus/conn-requests.cpp
index e9a2352..a077c16 100644
--- a/tests/dbus/conn-requests.cpp
+++ b/tests/dbus/conn-requests.cpp
@@ -9,6 +9,7 @@
 #include <TelepathyQt4/Client/Connection>
 #include <TelepathyQt4/Client/PendingChannel>
 #include <TelepathyQt4/Client/PendingHandles>
+#include <TelepathyQt4/Client/ReferencedHandles>
 #include <TelepathyQt4/Debug>
 
 #include <telepathy-glib/debug.h>
-- 
1.5.6.5




More information about the telepathy-commits mailing list