[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=002267a

The following commit has been merged in the master branch:
commit 002267adf1543ae820416e6bc8bfe7e646c7d1d0
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Jul 30 10:10:54 2012 +0200

    Move private members in a Private class
---
 KTp/Widgets/contact-grid-dialog.cpp | 128 ++++++++++++++++++++++--------------
 KTp/Widgets/contact-grid-dialog.h   |  15 ++---
 2 files changed, 83 insertions(+), 60 deletions(-)

diff --git a/KTp/Widgets/contact-grid-dialog.cpp b/KTp/Widgets/contact-grid-dialog.cpp
index 6647c6b..fb1ebc5 100644
--- a/KTp/Widgets/contact-grid-dialog.cpp
+++ b/KTp/Widgets/contact-grid-dialog.cpp
@@ -39,10 +39,68 @@
 
 
 
+class KTp::ContactGridDialog::Private
+{
+public:
+    Private(KTp::ContactGridDialog *parent) :
+        q(parent),
+        accountsModel(0),
+        contact(0)
+    {
+    }
+
+    KTp::ContactGridDialog * const q;
+
+    Tp::AccountManagerPtr accountManager;
+    AccountsModel *accountsModel;
+    KTp::ContactGridWidget *contactGridWidget;
+    Tp::AccountPtr account;
+    Tp::ContactPtr contact;
+
+public Q_SLOTS:
+    void _k_onAccountManagerReady();
+    void _k_onOkClicked();
+    void _k_onChanged();
+};
+
+
+void KTp::ContactGridDialog::Private::_k_onAccountManagerReady()
+{
+    kDebug() << "Account manager is ready";
+    accountsModel->setAccountManager(accountManager);
+}
+
+void KTp::ContactGridDialog::Private::_k_onOkClicked()
+{
+    // don't do anytghing if no contact has been selected
+    if (!contactGridWidget->hasSelection()) {
+        // show message box?
+        return;
+    }
+
+    contact = contactGridWidget->selectedContact();
+    account = contactGridWidget->selectedAccount();
+
+    if (account.isNull()) {
+        kWarning() << "Account is NULL";
+    } else if (contact.isNull()) {
+        kWarning() << "Contact is NULL";
+    } else {
+        kDebug() << "Account is: " << account->displayName();
+        kDebug() << "Contact is: " << contact->alias();
+    }
+}
+
+void KTp::ContactGridDialog::Private::_k_onChanged()
+{
+    q->button(KDialog::Ok)->setEnabled(contactGridWidget->hasSelection());
+}
+
+
+
 KTp::ContactGridDialog::ContactGridDialog(QWidget *parent) :
     KDialog(parent),
-    m_accountsModel(0),
-    m_contact(0)
+    d(new Private(this))
 {
     resize(500,450);
 
@@ -65,70 +123,40 @@ KTp::ContactGridDialog::ContactGridDialog(QWidget *parent) :
 
     Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
 
-    m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
-                                                  accountFactory,
-                                                  connectionFactory,
-                                                  channelFactory,
-                                                  contactFactory);
+    d->accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
+                                                   accountFactory,
+                                                   connectionFactory,
+                                                   channelFactory,
+                                                   contactFactory);
 
-    m_accountsModel = new AccountsModel(this);
-    connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAccountManagerReady()));
+    d->accountsModel = new AccountsModel(this);
+    connect(d->accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(_k_onAccountManagerReady()));
 
 
-    m_contactGridWidget = new KTp::ContactGridWidget(m_accountsModel, this);
-    m_contactGridWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
-    m_contactGridWidget->filter()->setPresenceTypeFilterFlags(AccountsFilterModel::ShowOnlyConnected);
-//    m_contactGridWidget->filter()->setCapabilityFilterFlags(AccountsFilterModel::FilterBySSHContactCapability);
-    setMainWidget(m_contactGridWidget);
+    d->contactGridWidget = new KTp::ContactGridWidget(d->accountsModel, this);
+    d->contactGridWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
+    d->contactGridWidget->filter()->setPresenceTypeFilterFlags(AccountsFilterModel::ShowOnlyConnected);
+//    d->contactGridWidget->filter()->setCapabilityFilterFlags(AccountsFilterModel::FilterBySSHContactCapability);
+    setMainWidget(d->contactGridWidget);
 
-    connect(m_contactGridWidget,
+    connect(d->contactGridWidget,
             SIGNAL(selectionChanged(Tp::AccountPtr,Tp::ContactPtr)),
-            SLOT(onChanged()));
+            SLOT(_k_onChanged()));
 
     button(KDialog::Ok)->setDisabled(true);
 
-    connect(this, SIGNAL(okClicked()), SLOT(onOkClicked()));
+    connect(this, SIGNAL(okClicked()), SLOT(_k_onOkClicked()));
     connect(this, SIGNAL(rejected()), SLOT(close()));
 }
 
 Tp::AccountPtr KTp::ContactGridDialog::account()
 {
-    return m_account;
+    return d->account;
 }
 
 Tp::ContactPtr KTp::ContactGridDialog::contact()
 {
-    return m_contact;
-}
-
-void KTp::ContactGridDialog::onAccountManagerReady()
-{
-    kDebug() << "Account manager is ready";
-    m_accountsModel->setAccountManager(m_accountManager);
-}
-
-void KTp::ContactGridDialog::onOkClicked()
-{
-    // don't do anytghing if no contact has been selected
-    if (!m_contactGridWidget->hasSelection()) {
-        // show message box?
-        return;
-    }
-
-    m_contact = m_contactGridWidget->selectedContact();
-    m_account = m_contactGridWidget->selectedAccount();
-
-    if (m_account.isNull()) {
-        kWarning() << "Account is NULL";
-    } else if (m_contact.isNull()) {
-        kWarning() << "Contact is NULL";
-    } else {
-        kDebug() << "Account is: " << m_account->displayName();
-        kDebug() << "Contact is: " << m_contact->alias();
-    }
+    return d->contact;
 }
 
-void KTp::ContactGridDialog::onChanged()
-{
-    button(KDialog::Ok)->setEnabled(m_contactGridWidget->hasSelection());
-}
+#include "contact-grid-dialog.moc"
diff --git a/KTp/Widgets/contact-grid-dialog.h b/KTp/Widgets/contact-grid-dialog.h
index 541b913..c45e12d 100644
--- a/KTp/Widgets/contact-grid-dialog.h
+++ b/KTp/Widgets/contact-grid-dialog.h
@@ -51,18 +51,13 @@ public:
     Tp::AccountPtr account();
     Tp::ContactPtr contact();
 
-private Q_SLOTS:
-    void onAccountManagerReady();
-    void onOkClicked();
-    void onChanged();
-
 private:
-    Tp::AccountManagerPtr m_accountManager;
-    AccountsModel *m_accountsModel;
-    KTp::ContactGridWidget *m_contactGridWidget;
-    Tp::AccountPtr m_account;
-    Tp::ContactPtr m_contact;
+    class Private;
+    Private * const d;
 
+    Q_PRIVATE_SLOT(d, void _k_onAccountManagerReady());
+    Q_PRIVATE_SLOT(d, void _k_onOkClicked());
+    Q_PRIVATE_SLOT(d, void _k_onChanged());
 };
 
 } // namespace KTp

-- 
ktp-common-internals packaging