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

[Simon McVittie]

This means we can include only the internal header in the .cpp, and
the public header will still be checked for self-containedness. So,
do that.
---
 TelepathyQt4/Client/connection-manager-internal.h |    5 ++---
 TelepathyQt4/Client/connection-manager.cpp        |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/TelepathyQt4/Client/connection-manager-internal.h b/TelepathyQt4/Client/connection-manager-internal.h
index a44c721..9a8dbf9 100644
--- a/TelepathyQt4/Client/connection-manager-internal.h
+++ b/TelepathyQt4/Client/connection-manager-internal.h
@@ -22,6 +22,8 @@
 #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>
@@ -34,9 +36,6 @@ 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 78a1281..73d065a 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/Client/connection-manager.cpp
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <TelepathyQt4/Client/ConnectionManager>
-#include "connection-manager-internal.h"
+#include "TelepathyQt4/Client/connection-manager-internal.h"
 
 #include "TelepathyQt4/_gen/cli-connection-manager-body.hpp"
 #include "TelepathyQt4/_gen/cli-connection-manager.moc.hpp"
-- 
1.5.6.5