[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=dd2c2a1

The following commit has been merged in the master branch:
commit dd2c2a1281344d0924417e432937a71742e88bb7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jan 16 01:17:45 2013 +0000

    Namespace AccountsListModel
---
 src/kcm-telepathy-accounts.cpp | 19 +++++++++----------
 src/kcm-telepathy-accounts.h   |  7 +++++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 52565c5..9ca5949 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -69,7 +69,7 @@ K_EXPORT_PLUGIN(KCMTelepathyAccountsFactory("telepathy_accounts", "telepathy-acc
 
 KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList& args)
  : KCModule(KCMTelepathyAccountsFactory::componentData(), parent, args),
-   m_accountsListModel(0)
+   m_accountsListModel(new KTp::AccountsListModel(this))
 {
     //set up component data.
     KAboutData *aboutData = new KAboutData(I18N_NOOP("telepathy_accounts"), 0, ki18n("Instant Messaging and VOIP Accounts"), "0.5.2", KLocalizedString(), KAboutData::License_GPL);
@@ -111,20 +111,19 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
     m_ui->salutEnableFrame->setHidden(true);
     m_ui->salutEnableCheckbox->setIcon(KIcon(QLatin1String("im-local-xmpp")));
     m_ui->salutEnableCheckbox->setIconSize(QSize(32, 32));
-    m_accountsListModel = new AccountsListModel(this);
 
     // On the kcm_telepathy_account we filter using "local-xmpp" and not using
     // "salut" because in this way we can see on top also local-xmpp accounts
     // configured using haze
     m_salutFilterModel = new QSortFilterProxyModel(this);
     m_salutFilterModel->setSourceModel(m_accountsListModel);
-    m_salutFilterModel->setFilterRole(AccountsListModel::ConnectionProtocolNameRole);
+    m_salutFilterModel->setFilterRole(KTp::AccountsListModel::ConnectionProtocolNameRole);
     m_salutFilterModel->setFilterFixedString(QLatin1String("local-xmpp"));
     m_ui->salutListView->setModel(m_salutFilterModel);
 
     m_accountsFilterModel = new QSortFilterProxyModel(this);
     m_accountsFilterModel->setSourceModel(m_accountsListModel);
-    m_accountsFilterModel->setFilterRole(AccountsListModel::ConnectionProtocolNameRole);
+    m_accountsFilterModel->setFilterRole(KTp::AccountsListModel::ConnectionProtocolNameRole);
     m_accountsFilterModel->setFilterRegExp(QLatin1String("^((?!local-xmpp).)*$"));
     m_accountsFilterModel->setSortRole(Qt::DisplayRole);
     m_accountsFilterModel->setSortCaseSensitivity(Qt::CaseInsensitive);
@@ -223,11 +222,11 @@ void KCMTelepathyAccounts::onAccountEnabledChanged(const QModelIndex &index, boo
     else {
         value = QVariant(Qt::Unchecked);
     }
-    m_accountsListModel->setData(index, value, AccountsListModel::EnabledRole);
+    m_accountsListModel->setData(index, value, KTp::AccountsListModel::EnabledRole);
 
     if (enabled) {
         // connect the account
-        Tp::AccountPtr account = index.data(AccountsListModel::AccountRole).value<Tp::AccountPtr>();
+        Tp::AccountPtr account = index.data(KTp::AccountsListModel::AccountRole).value<Tp::AccountPtr>();
         if (!account.isNull()) {
             account->setRequestedPresence(Tp::Presence::available());
         }
@@ -307,7 +306,7 @@ void KCMTelepathyAccounts::onSelectedItemChanged(const QModelIndex &current, con
     m_ui->removeAccountButton->setEnabled(current.isValid());
     m_ui->editAccountButton->setEnabled(current.isValid());
 
-    if (current.isValid() && current.data(AccountsListModel::ConnectionStateRole).toInt() == Tp::ConnectionStatusConnected) {
+    if (current.isValid() && current.data(KTp::AccountsListModel::ConnectionStateRole).toInt() == Tp::ConnectionStatusConnected) {
         m_ui->editAccountIdentityButton->setEnabled(true);
     } else {
         m_ui->editAccountIdentityButton->setEnabled(false);
@@ -353,7 +352,7 @@ void KCMTelepathyAccounts::onEditAccountClicked()
     if (!index.isValid()) {
         return;
     }
-    Tp::AccountPtr account = index.data(AccountsListModel::AccountRole).value<Tp::AccountPtr>();
+    Tp::AccountPtr account = index.data(KTp::AccountsListModel::AccountRole).value<Tp::AccountPtr>();
 
     if (account.isNull()) {
         return;
@@ -375,7 +374,7 @@ void KCMTelepathyAccounts::onEditIdentityClicked()
         return;
     }
 
-    Tp::AccountPtr account = index.data(AccountsListModel::AccountRole).value<Tp::AccountPtr>();
+    Tp::AccountPtr account = index.data(KTp::AccountsListModel::AccountRole).value<Tp::AccountPtr>();
 
     if (account.isNull()) {
         return;
@@ -401,7 +400,7 @@ void KCMTelepathyAccounts::onRemoveAccountClicked()
 			QStringList(),  i18n("Remove conversations logs"), &removeLogs,
 			KMessageBox::Dangerous | KMessageBox::Notify) == KDialog::Yes) {
 
-	Tp::AccountPtr account = index.data(AccountsListModel::AccountRole).value<Tp::AccountPtr>();
+	Tp::AccountPtr account = index.data(KTp::AccountsListModel::AccountRole).value<Tp::AccountPtr>();
 	if (account.isNull()) {
 	    return;
 	}
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index c944042..d4802db 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -29,12 +29,15 @@
 class QFrame;
 class KPixmapSequenceOverlayPainter;
 class SalutEnabler;
-class AccountsListModel;
 class AddAccountAssistant;
 class QSortFilterProxyModel;
 class QListView;
 class KProgressDialog;
 
+namespace KTp {
+    class AccountsListModel;
+}
+
 namespace Tp {
     class PendingOperation;
 }
@@ -81,7 +84,7 @@ private:
     Ui::MainWidget *m_ui;
 
     Tp::AccountManagerPtr m_accountManager;
-    AccountsListModel *m_accountsListModel;
+    KTp::AccountsListModel *m_accountsListModel;
     QSortFilterProxyModel *m_salutFilterModel;
     QSortFilterProxyModel *m_accountsFilterModel;
     const QSortFilterProxyModel *m_currentModel;

-- 
ktp-accounts-kcm packaging