[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=1e04b59

The following commit has been merged in the master branch:
commit 1e04b59a646afac60442d69c76528e600c13b9b6
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Nov 9 15:31:38 2012 +0900

    Remove final references to AccountItem in AccountsListModel
---
 KTp/Models/accounts-list-model.cpp | 24 ++++++++++++------------
 KTp/Models/accounts-list-model.h   |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index 8453fc3..d46011a 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -175,7 +175,7 @@ Qt::ItemFlags AccountsListModel::flags(const QModelIndex &index) const
 
 void AccountsListModel::onAccountAdded(const Tp::AccountPtr &account)
 {
-    kDebug() << "Creating a new AccountItem from account:" << account.data();
+    kDebug() << "Creating a new Account from account:" << account.data();
 
     // Check if the account is already in the model.
     bool found = false;
@@ -194,7 +194,7 @@ void AccountsListModel::onAccountAdded(const Tp::AccountPtr &account)
                    << account.data()
                    << "to model, but it is already present. Doing nothing.";
     } else {
-        kDebug() << "Account not already in model. Create new AccountItem from account:"
+        kDebug() << "Account not already in model. Create new Account from account:"
                  << account.data();
 
         beginInsertRows(QModelIndex(), d->accounts.size(), d->accounts.size());
@@ -203,46 +203,46 @@ void AccountsListModel::onAccountAdded(const Tp::AccountPtr &account)
 
         connect(account.data(),
                 SIGNAL(stateChanged(bool)),
-                SLOT(onAccountItemUpdated()));
+                SLOT(onAccountUpdated()));
         connect(account.data(),
                 SIGNAL(displayNameChanged(QString)),
-                SLOT(onAccountItemUpdated()));
+                SLOT(onAccountUpdated()));
         connect(account.data(),
                 SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)),
-                SLOT(onAccountItemUpdated()));
+                SLOT(onAccountUpdated()));
         connect(account.data(),
                 SIGNAL(iconNameChanged(QString)),
-                SLOT(onAccountItemUpdated()));
+                SLOT(onAccountUpdated()));
         connect(account.data(),
                 SIGNAL(stateChanged(bool)),
-                SLOT(onAccountItemUpdated()));
+                SLOT(onAccountUpdated()));
     }
 }
 
-void AccountsListModel::onAccountItemRemoved()
+void AccountsListModel::onAccountRemoved()
 {
     Tp::AccountPtr item = Tp::AccountPtr(qobject_cast<Tp::Account*>(sender()));
 
     Q_ASSERT(item);
     if (!item) {
-        kWarning() << "Not an AccountItem pointer:" << sender();
+        kWarning() << "Not an Account pointer:" << sender();
         return;
     }
 
-    // We can be pretty sure that there is only one reference to a specific AccountItem in the list
+    // We can be pretty sure that there is only one reference to a specific Account in the list
     // If we screw up here, the styling delegate will screw up even more
     beginRemoveRows(QModelIndex(), d->accounts.indexOf(item), d->accounts.indexOf(item));
     d->accounts.removeAll(item);
     endRemoveRows();
 }
 
-void AccountsListModel::onAccountItemUpdated()
+void AccountsListModel::onAccountUpdated()
 {
     Tp::AccountPtr item = Tp::AccountPtr(qobject_cast<Tp::Account*>(sender()));
 
     Q_ASSERT(item);
     if (!item) {
-        kWarning() << "Not an AccountItem pointer:" << sender();
+        kWarning() << "Not an Account pointer:" << sender();
         return;
     }
 
diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index 365a522..f205a69 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -59,8 +59,8 @@ public:
 
 private Q_SLOTS:
     void onAccountAdded(const Tp::AccountPtr &account);
-    void onAccountItemRemoved();
-    void onAccountItemUpdated();
+    void onAccountRemoved();
+    void onAccountUpdated();
 
 private:
     class Private;

-- 
ktp-common-internals packaging