[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=6bcfc53

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

    Add a categorized sort-filter proxy model and disable copying of the main class.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=917027
---
 src/kcm-telepathy-accounts.cpp | 4 +++-
 src/kcm-telepathy-accounts.h   | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index c6b7038..8dfae80 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -20,6 +20,7 @@
 
 #include "kcm-telepathy-accounts.h"
 
+#include <kcategorizedsortfilterproxymodel.h>
 #include <kgenericfactory.h>
 
 
@@ -28,7 +29,8 @@ K_EXPORT_PLUGIN(KCMTelepathyAccountsFactory("telepathy_accounts", "kcm_telepathy
 
 
 KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList& args)
- : KCModule(KCMTelepathyAccountsFactory::componentData(), parent, args)
+ : KCModule(KCMTelepathyAccountsFactory::componentData(), parent, args),
+   m_accountsListProxyModel(0)
 {
     // TODO: Implement me!
     setupUi(this);
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index d72e377..878b283 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -25,14 +25,20 @@
 
 #include <kcmodule.h>
 
+class KCategorizedSortFilterProxyModel;
+
 class KCMTelepathyAccounts : public KCModule, Ui::MainWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY(KCMTelepathyAccounts);
 
 public:
     explicit KCMTelepathyAccounts(QWidget *parent = 0,
                                   const QVariantList& args = QVariantList());
-    ~KCMTelepathyAccounts();
+    virtual ~KCMTelepathyAccounts();
+
+private:
+    KCategorizedSortFilterProxyModel *m_accountsListProxyModel;
 
 };
 

-- 
ktp-accounts-kcm packaging