[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=3048fd1

The following commit has been merged in the master branch:
commit 3048fd1f14ebbdaea3796a0500da94f90d7a15c8
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Wed Jul 11 16:28:49 2012 +0300

    AddContactDialog: Remove public accessors for account and screen name
---
 KTp/Widgets/add-contact-dialog.cpp | 24 +++++++-----------------
 KTp/Widgets/add-contact-dialog.h   |  2 --
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/KTp/Widgets/add-contact-dialog.cpp b/KTp/Widgets/add-contact-dialog.cpp
index d0c576b..1534dd7 100644
--- a/KTp/Widgets/add-contact-dialog.cpp
+++ b/KTp/Widgets/add-contact-dialog.cpp
@@ -110,36 +110,26 @@ AddContactDialog::~AddContactDialog()
     delete d;
 }
 
-Tp::AccountPtr AddContactDialog::account() const
+void AddContactDialog::accept()
 {
-    QVariant itemData = d->ui->accountCombo->itemData(d->ui->accountCombo->currentIndex(),AccountsModel::ItemRole);
+    Tp::AccountPtr account;
+    QVariant itemData = d->ui->accountCombo->itemData(d->ui->accountCombo->currentIndex(), AccountsModel::ItemRole);
     AccountsModelItem* item = itemData.value<AccountsModelItem*>();
     if (item) {
-        return item->account();
-    } else {
-        return Tp::AccountPtr();
+        account = item->account();
     }
-}
-
-const QString AddContactDialog::screenName() const
-{
-    return d->ui->screenNameLineEdit->text();
-}
 
-void AddContactDialog::accept()
-{
-    Tp::AccountPtr acc = account();
-    if (acc.isNull()) {
+    if (account.isNull()) {
         KMessageBox::error(this,
                 i18n("Seems like you forgot to select an account. Also do not forget to connect it first."),
                 i18n("No Account Selected"));
-    } else if (acc->connection().isNull()) {
+    } else if (account->connection().isNull()) {
         KMessageBox::error(this,
                 i18n("The requested account has disconnected and so the contact could not be added. Sorry."),
                 i18n("Connection Error"));
     } else {
         QStringList identifiers = QStringList() << d->ui->screenNameLineEdit->text();
-        Tp::PendingContacts *pendingContacts = acc->connection()->contactManager()->contactsForIdentifiers(identifiers);
+        Tp::PendingContacts *pendingContacts = account->connection()->contactManager()->contactsForIdentifiers(identifiers);
         connect(pendingContacts, SIGNAL(finished(Tp::PendingOperation*)),
                 this, SLOT(_k_onContactsForIdentifiersFinished(Tp::PendingOperation*)));
         setInProgress(true);
diff --git a/KTp/Widgets/add-contact-dialog.h b/KTp/Widgets/add-contact-dialog.h
index 5afdccd..96b5fc0 100644
--- a/KTp/Widgets/add-contact-dialog.h
+++ b/KTp/Widgets/add-contact-dialog.h
@@ -41,8 +41,6 @@ class KTP_EXPORT AddContactDialog : public KDialog
 public:
     explicit AddContactDialog(AccountsModel* accountModel, QWidget *parent = 0);
     virtual ~AddContactDialog();
-    Tp::AccountPtr account() const;
-    const QString screenName() const;
 
     virtual void accept();
 

-- 
ktp-common-internals packaging