[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=7fa5697

The following commit has been merged in the master branch:
commit 7fa5697976e387141db3f1e6bb18661b7f915d86
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Jan 26 18:05:19 2009 +0000

    Add a stub model for the accounts list.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=917028
---
 .../accounts-list-model.cpp}                       | 37 ++++++++--------------
 .../accounts-list-model.h}                         | 35 ++++++++------------
 2 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/KTp/pending-wallet.h b/KTp/Models/accounts-list-model.cpp
similarity index 55%
copy from KTp/pending-wallet.h
copy to KTp/Models/accounts-list-model.cpp
index 9ef86d7..34b214f 100644
--- a/KTp/pending-wallet.h
+++ b/KTp/Models/accounts-list-model.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 David Edmundson <kde at davidedmundson.co.uk>
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,30 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "accounts-list-model.h"
 
-#ifndef PENDINGWALLETOPERATION_H
-#define PENDINGWALLETOPERATION_H
-
-#include <TelepathyQt/PendingOperation>
-
-#include "wallet-interface.h"
-#include <KTp/ktp-export.h>
-
-namespace KTp
+AccountsListModel::AccountsListModel(QObject *parent)
+ : QAbstractListModel(parent)
 {
-class PendingWalletPrivate;
+    // TODO: Implement me!
+}
 
-class KTP_EXPORT PendingWallet : public Tp::PendingOperation
+AccountsListModel::~AccountsListModel()
 {
-    Q_OBJECT
-public:
-    friend class WalletInterface;
-    KTp::WalletInterface *walletInterface() const;
-private:
-    PendingWallet(KTp::WalletInterface *wallet);
-    virtual ~PendingWallet();
-    KTp::PendingWalletPrivate *d;
-};
-
+    // TODO: Implement me!
 }
-#endif // PENDINGWALLETOPERATION_H
+
+
+#include "accounts-list-model.moc"
+
diff --git a/KTp/pending-wallet.h b/KTp/Models/accounts-list-model.h
similarity index 57%
copy from KTp/pending-wallet.h
copy to KTp/Models/accounts-list-model.h
index 9ef86d7..9f45412 100644
--- a/KTp/pending-wallet.h
+++ b/KTp/Models/accounts-list-model.h
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 David Edmundson <kde at davidedmundson.co.uk>
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,30 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef TELEPATHY_ACCOUNTS_KCM_ACCOUNTS_LIST_MODEL_H
+#define TELEPATHY_ACCOUNTS_KCM_ACCOUNTS_LIST_MODEL_H
 
-#ifndef PENDINGWALLETOPERATION_H
-#define PENDINGWALLETOPERATION_H
-
-#include <TelepathyQt/PendingOperation>
-
-#include "wallet-interface.h"
-#include <KTp/ktp-export.h>
-
-namespace KTp
-{
-class PendingWalletPrivate;
+#include <QAbstractListModel>
 
-class KTP_EXPORT PendingWallet : public Tp::PendingOperation
+class AccountsListModel : public QAbstractListModel
 {
     Q_OBJECT
+    Q_DISABLE_COPY(AccountsListModel);
+
 public:
-    friend class WalletInterface;
-    KTp::WalletInterface *walletInterface() const;
-private:
-    PendingWallet(KTp::WalletInterface *wallet);
-    virtual ~PendingWallet();
-    KTp::PendingWalletPrivate *d;
+    explicit AccountsListModel(QObject *parent = 0);
+    virtual ~AccountsListModel();
+
 };
 
-}
-#endif // PENDINGWALLETOPERATION_H
+#endif // header guard
+

-- 
ktp-common-internals packaging