[Telepathy-commits] [telepathy-qt4/master] Removed PendingReadyAccount in favor of PendingReady.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Mon Mar 2 19:58:21 PST 2009
---
TelepathyQt4/Client/PendingReadyAccount | 13 ---
TelepathyQt4/Client/pending-ready-account.cpp | 110 -------------------------
TelepathyQt4/Client/pending-ready-account.h | 62 --------------
TelepathyQt4/Makefile.am | 4 -
4 files changed, 0 insertions(+), 189 deletions(-)
delete mode 100644 TelepathyQt4/Client/PendingReadyAccount
delete mode 100644 TelepathyQt4/Client/pending-ready-account.cpp
delete mode 100644 TelepathyQt4/Client/pending-ready-account.h
diff --git a/TelepathyQt4/Client/PendingReadyAccount b/TelepathyQt4/Client/PendingReadyAccount
deleted file mode 100644
index 6ff95ca..0000000
--- a/TelepathyQt4/Client/PendingReadyAccount
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _TelepathyQt4_Client_PendingReadyAccount_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingReadyAccount_HEADER_GUARD_
-
-#ifndef IN_TELEPATHY_QT4_HEADER
-#define IN_TELEPATHY_QT4_HEADER
-#endif
-
-#include <TelepathyQt4/Client/pending-ready-account.h>
-
-#undef IN_TELEPATHY_QT4_HEADER
-
-#endif
-// vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/pending-ready-account.cpp b/TelepathyQt4/Client/pending-ready-account.cpp
deleted file mode 100644
index 3ab8a46..0000000
--- a/TelepathyQt4/Client/pending-ready-account.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This file is part of TelepathyQt4
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright (C) 2009 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
- */
-
-#include <TelepathyQt4/Client/PendingReadyAccount>
-
-#include "TelepathyQt4/Client/_gen/pending-ready-account.moc.hpp"
-
-#include "TelepathyQt4/debug-internal.h"
-
-#include <QDBusPendingCallWatcher>
-#include <QDBusPendingReply>
-
-/**
- * \addtogroup clientsideproxies Client-side proxies
- *
- * Proxy objects representing remote service objects accessed via D-Bus.
- *
- * In addition to providing direct access to methods, signals and properties
- * exported by the remote objects, some of these proxies offer features like
- * automatic inspection of remote object capabilities, property tracking,
- * backwards compatibility helpers for older services and other utilities.
- */
-
-namespace Telepathy
-{
-namespace Client
-{
-
-struct PendingReadyAccount::Private
-{
- Private(Account::Features requestedFeatures, Account *account) :
- requestedFeatures(requestedFeatures),
- account(account)
- {
- }
-
- Account::Features requestedFeatures;
- Account *account;
-};
-
-/**
- * \class PendingReadyAccount
- * \ingroup clientaccount
- * \headerfile <TelepathyQt4/Client/pending-ready-account.h> <TelepathyQt4/Client/PendingReadyAccount>
- *
- * Class containing the features requested and the reply to a request
- * for an account to become ready. Instances of this class cannot be
- * constructed directly; the only way to get one is via Account::becomeReady().
- */
-
-/**
- * Construct a PendingReadyAccount object.
- *
- * \param account The Account that will become ready.
- */
-PendingReadyAccount::PendingReadyAccount(Account::Features requestedFeatures, Account *account)
- : PendingOperation(account),
- mPriv(new Private(requestedFeatures, account))
-{
-}
-
-/**
- * Class destructor.
- */
-PendingReadyAccount::~PendingReadyAccount()
-{
- delete mPriv;
-}
-
-/**
- * Return the Account object through which the request was made.
- *
- * \return Account object.
- */
-Account *PendingReadyAccount::account() const
-{
- return mPriv->account;
-}
-
-/**
- * Return the Features that were requested to become ready on the
- * account.
- *
- * \return Features.
- */
-Account::Features PendingReadyAccount::requestedFeatures() const
-{
- return mPriv->requestedFeatures;
-}
-
-} // Telepathy::Client
-} // Telepathy
diff --git a/TelepathyQt4/Client/pending-ready-account.h b/TelepathyQt4/Client/pending-ready-account.h
deleted file mode 100644
index ba61038..0000000
--- a/TelepathyQt4/Client/pending-ready-account.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * This file is part of TelepathyQt4
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright (C) 2009 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_pending_ready_account_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_ready_account_h_HEADER_GUARD_
-
-#ifndef IN_TELEPATHY_QT4_HEADER
-#error IN_TELEPATHY_QT4_HEADER
-#endif
-
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/PendingOperation>
-
-class QDBusPendingCallWatcher;
-
-namespace Telepathy
-{
-namespace Client
-{
-
-class PendingReadyAccount : public PendingOperation
-{
- Q_OBJECT
-
-public:
- ~PendingReadyAccount();
-
- Account *account() const;
- Account::Features requestedFeatures() const;
-
-private:
- Q_DISABLE_COPY(PendingReadyAccount);
- PendingReadyAccount(Account::Features requestedFeatures, Account *account);
-
- struct Private;
- friend struct Private;
- friend class Account;
- Private *mPriv;
-};
-
-} // Telepathy::Client
-} // Telepathy
-
-#endif
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 62957f4..f05cd2c 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -60,7 +60,6 @@ libtelepathy_qt4_la_SOURCES = \
Client/pending-handles.cpp \
Client/pending-operation.cpp \
Client/pending-ready.cpp \
- Client/pending-ready-account.cpp \
Client/pending-ready-channel.cpp \
Client/pending-ready-connection-manager.cpp \
Client/pending-string-list.cpp \
@@ -117,7 +116,6 @@ nodist_libtelepathy_qt4_la_SOURCES = \
Client/_gen/pending-handles.moc.hpp \
Client/_gen/pending-operation.moc.hpp \
Client/_gen/pending-ready.moc.hpp \
- Client/_gen/pending-ready-account.moc.hpp \
Client/_gen/pending-ready-channel.moc.hpp \
Client/_gen/pending-ready-connection-manager.moc.hpp \
Client/_gen/pending-string-list.moc.hpp \
@@ -164,7 +162,6 @@ tpqt4clientinclude_HEADERS = \
Client/PendingHandles \
Client/PendingOperation \
Client/PendingReady \
- Client/PendingReadyAccount \
Client/PendingReadyChannel \
Client/PendingReadyConnectionManager \
Client/PendingSuccess \
@@ -234,7 +231,6 @@ tpqt4clientinclude_HEADERS = \
Client/pending-handles.h \
Client/pending-operation.h \
Client/pending-ready.h \
- Client/pending-ready-account.h \
Client/pending-ready-channel.h \
Client/pending-ready-connection-manager.h \
Client/pending-string-list.h \
--
1.5.6.5
More information about the telepathy-commits
mailing list