[Telepathy-commits] [telepathy-qt4/master] Revert "Include ConnectionManager public header, first, in connection-manager-internal.h"

[Andre Moreira Magalhaes (andrunko)]

This reverts commit c42b234f3d88a929a33f8bc10de99bda82122a90.
---
 TelepathyQt4/Client/connection-manager-internal.h |    5 +++--
 TelepathyQt4/Client/connection-manager.cpp        |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/TelepathyQt4/Client/connection-manager-internal.h b/TelepathyQt4/Client/connection-manager-internal.h
index 9a8dbf9..a44c721 100644
--- a/TelepathyQt4/Client/connection-manager-internal.h
+++ b/TelepathyQt4/Client/connection-manager-internal.h
@@ -22,8 +22,6 @@
 #ifndef _TelepathyQt4_cli_connection_manager_internal_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_connection_manager_internal_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Client/ConnectionManager>
-
 #include <TelepathyQt4/Client/PendingStringList>
 
 #include <QDBusConnection>
@@ -36,6 +34,9 @@ namespace Telepathy
 namespace Client
 {
 
+class ConnectionManager;
+class ConnectionManagerInterface;
+
 class ConnectionManager::Private : public QObject
 {
     Q_OBJECT
diff --git a/TelepathyQt4/Client/connection-manager.cpp b/TelepathyQt4/Client/connection-manager.cpp
index 0beaa98..11cc297 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/Client/connection-manager.cpp
@@ -19,7 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "TelepathyQt4/Client/connection-manager-internal.h"
+#include <TelepathyQt4/Client/ConnectionManager>
+#include "connection-manager-internal.h"
 
 #include "TelepathyQt4/_gen/cli-connection-manager-body.hpp"
 #include "TelepathyQt4/_gen/cli-connection-manager.moc.hpp"
-- 
1.5.6.5