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

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/account-internal.h |   96 --------------------------------
 TelepathyQt4/Client/account.cpp        |   48 ++++++++++++++++-
 TelepathyQt4/Makefile.am               |    1 -
 3 files changed, 47 insertions(+), 98 deletions(-)
 delete mode 100644 TelepathyQt4/Client/account-internal.h

diff --git a/TelepathyQt4/Client/account-internal.h b/TelepathyQt4/Client/account-internal.h
deleted file mode 100644
index 85c06be..0000000
--- a/TelepathyQt4/Client/account-internal.h
+++ /dev/null
@@ -1,96 +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_internal_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_account_internal_h_HEADER_GUARD_
-
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
-
-#include <QByteArray>
-#include <QQueue>
-#include <QString>
-#include <QStringList>
-#include <QVariantMap>
-
-namespace Telepathy
-{
-namespace Client
-{
-
-class Account;
-class AccountInterface;
-class ConnectionManager;
-class ProtocolInfo;
-
-struct Account::Private
-{
-public:
-    Private(Account *parent);
-    ~Private();
-
-    class PendingReady;
-
-    AccountInterface *baseInterface;
-    bool ready;
-    QList<PendingReady *> pendingOperations;
-    QQueue<void (Account::*)()> introspectQueue;
-    QStringList interfaces;
-    Account::Features features;
-    Account::Features pendingFeatures;
-    Account::Features missingFeatures;
-    QVariantMap parameters;
-    bool valid;
-    bool enabled;
-    bool connectsAutomatically;
-    QString cmName;
-    QString protocol;
-    QString displayName;
-    QString nickname;
-    QString icon;
-    QString connectionObjectPath;
-    QString normalizedName;
-    Telepathy::Avatar avatar;
-    ConnectionManager *cm;
-    ProtocolInfo *protocolInfo;
-    Telepathy::ConnectionStatus connectionStatus;
-    Telepathy::ConnectionStatusReason connectionStatusReason;
-    Telepathy::SimplePresence automaticPresence;
-    Telepathy::SimplePresence currentPresence;
-    Telepathy::SimplePresence requestedPresence;
-};
-
-class Account::Private::PendingReady : public PendingOperation
-{
-    // Account is a friend so it can call finished() etc.
-    friend class Account;
-
-public:
-    PendingReady(Account::Features features, QObject *parent = 0);
-
-    Account::Features features;
-};
-
-} // Telepathy::Client
-} // Telepathy
-
-#endif
diff --git a/TelepathyQt4/Client/account.cpp b/TelepathyQt4/Client/account.cpp
index fa3e83b..04f161a 100644
--- a/TelepathyQt4/Client/account.cpp
+++ b/TelepathyQt4/Client/account.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <TelepathyQt4/Client/Account>
-#include "TelepathyQt4/Client/account-internal.h"
 
 #include "TelepathyQt4/Client/_gen/account.moc.hpp"
 #include "TelepathyQt4/_gen/cli-account.moc.hpp"
@@ -55,6 +54,53 @@ namespace Telepathy
 namespace Client
 {
 
+struct Account::Private
+{
+    Private(Account *parent);
+    ~Private();
+
+    class PendingReady;
+
+    AccountInterface *baseInterface;
+    bool ready;
+    QList<PendingReady *> pendingOperations;
+    QQueue<void (Account::*)()> introspectQueue;
+    QStringList interfaces;
+    Account::Features features;
+    Account::Features pendingFeatures;
+    Account::Features missingFeatures;
+    QVariantMap parameters;
+    bool valid;
+    bool enabled;
+    bool connectsAutomatically;
+    QString cmName;
+    QString protocol;
+    QString displayName;
+    QString nickname;
+    QString icon;
+    QString connectionObjectPath;
+    QString normalizedName;
+    Telepathy::Avatar avatar;
+    ConnectionManager *cm;
+    ProtocolInfo *protocolInfo;
+    Telepathy::ConnectionStatus connectionStatus;
+    Telepathy::ConnectionStatusReason connectionStatusReason;
+    Telepathy::SimplePresence automaticPresence;
+    Telepathy::SimplePresence currentPresence;
+    Telepathy::SimplePresence requestedPresence;
+};
+
+class Account::Private::PendingReady : public PendingOperation
+{
+    // Account is a friend so it can call finished() etc.
+    friend class Account;
+
+public:
+    PendingReady(Account::Features features, QObject *parent = 0);
+
+    Account::Features features;
+};
+
 Account::Private::PendingReady::PendingReady(Account::Features features, QObject *parent)
     : PendingOperation(parent),
       features(features)
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index fbceb94..528930a 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -36,7 +36,6 @@ libtelepathy_qt4_la_DEPENDENCIES = Makefile.am
 
 libtelepathy_qt4_la_SOURCES = \
     Client/account.cpp \
-    Client/account-internal.h \
     Client/account-manager.cpp \
     Client/account-manager-internal.h \
     Client/channel.cpp \
-- 
1.5.6.5