[Telepathy-commits] [telepathy-qt4/master] Moved ConnectionManager::Private to connection-manager-internal.h.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/connection-manager-internal.h |   40 +++++++++++++++++++++
 TelepathyQt4/Client/connection-manager.cpp        |   37 -------------------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/TelepathyQt4/Client/connection-manager-internal.h b/TelepathyQt4/Client/connection-manager-internal.h
index 0714629..f83b20d 100644
--- a/TelepathyQt4/Client/connection-manager-internal.h
+++ b/TelepathyQt4/Client/connection-manager-internal.h
@@ -27,12 +27,52 @@
 #include <QDBusConnection>
 #include <QLatin1String>
 #include <QQueue>
+#include <QString>
 
 namespace Telepathy
 {
 namespace Client
 {
 
+class ConnectionManager;
+class ConnectionManagerInterface;
+
+struct ConnectionManager::Private
+{
+    ConnectionManager *parent;
+    ConnectionManagerInterface* baseInterface;
+    bool ready;
+    QQueue<void (Private::*)()> introspectQueue;
+    QQueue<QString> getParametersQueue;
+    QQueue<QString> protocolQueue;
+    QStringList interfaces;
+    ProtocolInfoList protocols;
+
+    Private(ConnectionManager *parent);
+    ~Private();
+
+    static QString makeBusName(const QString& name);
+    static QString makeObjectPath(const QString& name);
+
+    ProtocolInfo *protocol(const QString &protocolName);
+
+    bool checkConfigFile();
+    void callReadConfig();
+    void callGetAll();
+    void callGetParameters();
+    void callListProtocols();
+
+    class PendingReady : public PendingOperation
+    {
+        // ConnectionManager is a friend so it can call finished() etc.
+        friend class ConnectionManager;
+    public:
+        PendingReady(ConnectionManager *parent);
+    };
+
+    PendingReady *pendingReady;
+};
+
 class ConnectionManagerPendingNames : public PendingStringList
 {
     Q_OBJECT
diff --git a/TelepathyQt4/Client/connection-manager.cpp b/TelepathyQt4/Client/connection-manager.cpp
index b884d50..64ea879 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/Client/connection-manager.cpp
@@ -157,43 +157,6 @@ void ProtocolInfo::addParameter(const ParamSpec &spec)
 }
 
 
-struct ConnectionManager::Private
-{
-    ConnectionManager *parent;
-    ConnectionManagerInterface* baseInterface;
-    bool ready;
-    QQueue<void (Private::*)()> introspectQueue;
-    QQueue<QString> getParametersQueue;
-    QQueue<QString> protocolQueue;
-    QStringList interfaces;
-    ProtocolInfoList protocols;
-
-    Private(ConnectionManager *parent);
-    ~Private();
-
-    static QString makeBusName(const QString& name);
-    static QString makeObjectPath(const QString& name);
-
-    ProtocolInfo *protocol(const QString &protocolName);
-
-    bool checkConfigFile();
-    void callReadConfig();
-    void callGetAll();
-    void callGetParameters();
-    void callListProtocols();
-
-    class PendingReady : public PendingOperation
-    {
-        // ConnectionManager is a friend so it can call finished() etc.
-        friend class ConnectionManager;
-    public:
-        PendingReady(ConnectionManager *parent);
-    };
-
-    PendingReady *pendingReady;
-};
-
-
 ConnectionManager::Private::PendingReady::PendingReady(ConnectionManager *parent)
     : PendingOperation(parent)
 {
-- 
1.5.6.5