[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=93cc003

The following commit has been merged in the master branch:
commit 93cc003ccacc76b5ff6bb8e536266684ec6d7eee
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
---
 src/CMakeLists.txt                                 |  1 +
 ...epathy-accounts.cpp => accounts-list-model.cpp} | 20 +++++---------------
 ...-telepathy-accounts.h => accounts-list-model.h} | 22 +++++++---------------
 3 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0006c0f..21d3761 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 
 set (telepathy_accounts_kcm_SRCS
      kcm-telepathy-accounts.cpp
+     accounts-list-model.cpp
 )
 
 kde4_add_ui_files (telepathy_accounts_kcm_SRCS
diff --git a/src/kcm-telepathy-accounts.cpp b/src/accounts-list-model.cpp
similarity index 61%
copy from src/kcm-telepathy-accounts.cpp
copy to src/accounts-list-model.cpp
index 8dfae80..34b214f 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/accounts-list-model.cpp
@@ -18,29 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "kcm-telepathy-accounts.h"
+#include "accounts-list-model.h"
 
-#include <kcategorizedsortfilterproxymodel.h>
-#include <kgenericfactory.h>
-
-
-K_PLUGIN_FACTORY(KCMTelepathyAccountsFactory, registerPlugin<KCMTelepathyAccounts>();)
-K_EXPORT_PLUGIN(KCMTelepathyAccountsFactory("telepathy_accounts", "kcm_telepathy_accounts"))
-
-
-KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList& args)
- : KCModule(KCMTelepathyAccountsFactory::componentData(), parent, args),
-   m_accountsListProxyModel(0)
+AccountsListModel::AccountsListModel(QObject *parent)
+ : QAbstractListModel(parent)
 {
     // TODO: Implement me!
-    setupUi(this);
 }
 
-KCMTelepathyAccounts::~KCMTelepathyAccounts()
+AccountsListModel::~AccountsListModel()
 {
     // TODO: Implement me!
 }
 
 
-#include "kcm-telepathy-accounts.moc"
+#include "accounts-list-model.moc"
 
diff --git a/src/kcm-telepathy-accounts.h b/src/accounts-list-model.h
similarity index 62%
copy from src/kcm-telepathy-accounts.h
copy to src/accounts-list-model.h
index 878b283..9f45412 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/accounts-list-model.h
@@ -18,27 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_KCM_TELEPATHY_ACCOUNTS_H
-#define TELEPATHY_ACCOUNTS_KCM_KCM_TELEPATHY_ACCOUNTS_H
+#ifndef TELEPATHY_ACCOUNTS_KCM_ACCOUNTS_LIST_MODEL_H
+#define TELEPATHY_ACCOUNTS_KCM_ACCOUNTS_LIST_MODEL_H
 
-#include "ui_main-widget.h"
+#include <QAbstractListModel>
 
-#include <kcmodule.h>
-
-class KCategorizedSortFilterProxyModel;
-
-class KCMTelepathyAccounts : public KCModule, Ui::MainWidget
+class AccountsListModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_DISABLE_COPY(KCMTelepathyAccounts);
+    Q_DISABLE_COPY(AccountsListModel);
 
 public:
-    explicit KCMTelepathyAccounts(QWidget *parent = 0,
-                                  const QVariantList& args = QVariantList());
-    virtual ~KCMTelepathyAccounts();
-
-private:
-    KCategorizedSortFilterProxyModel *m_accountsListProxyModel;
+    explicit AccountsListModel(QObject *parent = 0);
+    virtual ~AccountsListModel();
 
 };
 

-- 
ktp-accounts-kcm packaging