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

The following commit has been merged in the master branch:
commit 7b3b6aa040d3cf84173bcc74a97b7186fc638104
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Wed Jul 11 16:30:50 2012 +0300

    AddContactsDialog: Use QComboBox::setModel() instead of manually populating it with entries from the model
---
 KTp/Widgets/add-contact-dialog.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/KTp/Widgets/add-contact-dialog.cpp b/KTp/Widgets/add-contact-dialog.cpp
index 1534dd7..e2acd67 100644
--- a/KTp/Widgets/add-contact-dialog.cpp
+++ b/KTp/Widgets/add-contact-dialog.cpp
@@ -94,12 +94,7 @@ AddContactDialog::AddContactDialog(AccountsModel *accountModel, QWidget *parent)
 
     SubscribableAccountsModel *filteredModel = new SubscribableAccountsModel(this);
     filteredModel->setSourceModel(accountModel);
-    for (int i = 0; i < filteredModel->rowCount(); ++i) {
-        //TODO accountCombo->setModel()
-        d->ui->accountCombo->addItem(KIcon(filteredModel->data(filteredModel->index(i, 0), AccountsModel::IconRole).toString()),
-                                  filteredModel->data(filteredModel->index(i, 0)).toString(),
-                                  filteredModel->data(filteredModel->index(i, 0), AccountsModel::ItemRole));
-    }
+    d->ui->accountCombo->setModel(filteredModel);
 
     d->ui->screenNameLineEdit->setFocus();
 }

-- 
ktp-common-internals packaging