[Telepathy-commits] [telepathy-qt4/master] Removed account-manager-internal.h.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/account-manager-internal.h |   71 ------------------------
 TelepathyQt4/Client/account-manager.cpp        |   29 +++++++++-
 TelepathyQt4/Makefile.am                       |    1 -
 3 files changed, 28 insertions(+), 73 deletions(-)
 delete mode 100644 TelepathyQt4/Client/account-manager-internal.h

diff --git a/TelepathyQt4/Client/account-manager-internal.h b/TelepathyQt4/Client/account-manager-internal.h
deleted file mode 100644
index a216c48..0000000
--- a/TelepathyQt4/Client/account-manager-internal.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of TelepathyQt4
- *
- * Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright (C) 2008 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef _TelepathyQt4_cli_account_manager_internal_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_account_manager_internal_h_HEADER_GUARD_
-
-#include <TelepathyQt4/Client/PendingOperation>
-
-#include <QQueue>
-#include <QSet>
-#include <QStringList>
-
-namespace Telepathy
-{
-namespace Client
-{
-
-class AccountManager;
-class AccountManagerInterface;
-
-struct AccountManager::Private
-{
-public:
-    Private(AccountManager *parent);
-    ~Private();
-
-    void setAccountPaths(QSet<QString> &set, const QVariant &variant);
-
-    class PendingReady;
-
-    AccountManagerInterface *baseInterface;
-    bool ready;
-    PendingReady *pendingReady;
-    QQueue<void (AccountManager::*)()> introspectQueue;
-    QStringList interfaces;
-    AccountManager::Features features;
-    QSet<QString> validAccountPaths;
-    QSet<QString> invalidAccountPaths;
-};
-
-class AccountManager::Private::PendingReady : public PendingOperation
-{
-    // AccountManager is a friend so it can call finished() etc.
-    friend class AccountManager;
-
-public:
-    PendingReady(AccountManager *parent);
-};
-
-} // Telepathy::Client
-} // Telepathy
-
-#endif
diff --git a/TelepathyQt4/Client/account-manager.cpp b/TelepathyQt4/Client/account-manager.cpp
index 6d423b2..753b29a 100644
--- a/TelepathyQt4/Client/account-manager.cpp
+++ b/TelepathyQt4/Client/account-manager.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <TelepathyQt4/Client/AccountManager>
-#include "TelepathyQt4/Client/account-manager-internal.h"
 
 #include "TelepathyQt4/Client/_gen/account-manager.moc.hpp"
 #include "TelepathyQt4/_gen/cli-account-manager.moc.hpp"
@@ -61,6 +60,34 @@ namespace Telepathy
 namespace Client
 {
 
+struct AccountManager::Private
+{
+    Private(AccountManager *parent);
+    ~Private();
+
+    void setAccountPaths(QSet<QString> &set, const QVariant &variant);
+
+    class PendingReady;
+
+    AccountManagerInterface *baseInterface;
+    bool ready;
+    PendingReady *pendingReady;
+    QQueue<void (AccountManager::*)()> introspectQueue;
+    QStringList interfaces;
+    AccountManager::Features features;
+    QSet<QString> validAccountPaths;
+    QSet<QString> invalidAccountPaths;
+};
+
+class AccountManager::Private::PendingReady : public PendingOperation
+{
+    // AccountManager is a friend so it can call finished() etc.
+    friend class AccountManager;
+
+public:
+    PendingReady(AccountManager *parent);
+};
+
 AccountManager::Private::PendingReady::PendingReady(AccountManager *parent)
     : PendingOperation(parent)
 {
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 528930a..44f988c 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -37,7 +37,6 @@ libtelepathy_qt4_la_DEPENDENCIES = Makefile.am
 libtelepathy_qt4_la_SOURCES = \
     Client/account.cpp \
     Client/account-manager.cpp \
-    Client/account-manager-internal.h \
     Client/channel.cpp \
     Client/connection.cpp \
     Client/connection-manager.cpp \
-- 
1.5.6.5