[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=7482a29

The following commit has been merged in the master branch:
commit 7482a290b96765bc6afbf8b3509206c34bbd04db
Author: Thomas Richard <thomas9999 at gmail.com>
Date:   Sun Jan 16 18:15:00 2011 +0100

    Fix some deletes
    Fix some TODOs that were not needed
---
 .../generic-advanced-options-widget.cpp                   | 15 ++++++++-------
 src/KCMTelepathyAccounts/parameter-edit-delegate.cpp      |  4 ----
 src/KCMTelepathyAccounts/parameter-edit-model.cpp         | 11 ++++++-----
 src/accounts-list-model.cpp                               |  9 ++-------
 src/edit-account-dialog.cpp                               |  2 ++
 src/kcm-telepathy-accounts.cpp                            |  4 +---
 src/kcm-telepathy-accounts.h                              |  1 -
 7 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
index afef04c..4e0c2c1 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
@@ -36,7 +36,7 @@ public:
     {
         kDebug();
     }
-    KTabWidget tabWidget;
+    KTabWidget *tabWidget;
     QList<AbstractAccountParametersWidget*> widgets;
 };
 
@@ -45,10 +45,11 @@ GenericAdvancedOptionsWidget::GenericAdvancedOptionsWidget(ParameterEditModel *p
  : AbstractAccountParametersWidget(parameterModel, parent),
    d(new Private)
 {
+    d->tabWidget = new KTabWidget();
     QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->addWidget(&(d->tabWidget));
+    layout->addWidget(d->tabWidget);
 
-    d->tabWidget.setTabBarHidden(true);
+    d->tabWidget->setTabBarHidden(true);
 }
 
 GenericAdvancedOptionsWidget::~GenericAdvancedOptionsWidget()
@@ -93,17 +94,17 @@ bool GenericAdvancedOptionsWidget::validateParameterValues()
 
 void GenericAdvancedOptionsWidget::setTabBarHidden(bool hidden)
 {
-    d->tabWidget.setTabBarHidden(hidden);
+    d->tabWidget->setTabBarHidden(hidden);
 }
 
 void GenericAdvancedOptionsWidget::addTab(AbstractAccountParametersWidget* tab, const QString& label)
 {
-    if(d->tabWidget.count() == 1)
+    if(d->tabWidget->count() == 1)
     {
-        d->tabWidget.setTabBarHidden(false);
+        d->tabWidget->setTabBarHidden(false);
     }
 
-    d->tabWidget.addTab(tab, label);
+    d->tabWidget->addTab(tab, label);
     d->widgets.append(tab);
 }
 
diff --git a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
index 057a76d..945de6a 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
@@ -35,15 +35,11 @@ ParameterEditDelegate::ParameterEditDelegate(QAbstractItemView *itemView, QObjec
  : KWidgetItemDelegate(itemView, parent)
 {
     kDebug();
-
-    // TODO: Implement me!
 }
 
 ParameterEditDelegate::~ParameterEditDelegate()
 {
     kDebug();
-
-    // TODO: Implement me!
 }
 
 
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 557fe22..5ee3a56 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -38,15 +38,11 @@ ParameterEditModel::ParameterEditModel(QObject *parent)
  : QAbstractListModel(parent)
 {
     kDebug();
-
-    // TODO: Implement me!
 }
 
 ParameterEditModel::~ParameterEditModel()
 {
     kDebug();
-
-    // TODO: Implement me!
 }
 
 int ParameterEditModel::rowCount(const QModelIndex &index) const
@@ -180,7 +176,12 @@ Tp::ProtocolParameter ParameterEditModel::parameter(const QString &parameterName
 
 void ParameterEditModel::addItem(const Tp::ProtocolParameter &parameter, const QVariant &originalValue)
 {
-    // FIXME: Check we are not creating duplicate items.
+    // Check we are not creating duplicate items.
+    foreach (const ParameterItem *item, m_items) {
+        if(item->parameter() == parameter) {
+            return;
+        }
+    }
 
     // Create a new ParameterItem and add it to the list.
     beginInsertRows(QModelIndex(), m_items.size(), m_items.size());
diff --git a/src/accounts-list-model.cpp b/src/accounts-list-model.cpp
index 5ceaa9a..5fbe9a1 100644
--- a/src/accounts-list-model.cpp
+++ b/src/accounts-list-model.cpp
@@ -38,8 +38,6 @@ AccountsListModel::AccountsListModel(QObject *parent)
 AccountsListModel::~AccountsListModel()
 {
     kDebug();
-
-    // TODO: Implement me!
 }
 
 int AccountsListModel::rowCount(const QModelIndex &index) const
@@ -176,15 +174,12 @@ void AccountsListModel::onAccountItemRemoved()
         return;
     }
 
-    beginRemoveRows(QModelIndex(), m_accounts.lastIndexOf(item),
+    beginRemoveRows(QModelIndex(), m_accounts.indexOf(item),
                     m_accounts.lastIndexOf(item));
     m_accounts.removeAll(item);
     endRemoveRows();
 
-    Q_ASSERT(!m_accounts.contains(item));
-    if (m_accounts.contains(item)) {
-        kWarning() << "Ready Accounts still contains Accout Item:" << item;
-    }
+    delete item;
 }
 
 void AccountsListModel::onAccountItemUpdated()
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 6f88e7c..a145105 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -80,6 +80,8 @@ EditAccountDialog::EditAccountDialog(AccountItem *item, QWidget *parent)
 EditAccountDialog::~EditAccountDialog()
 {
     kDebug();
+
+    delete d;
 }
 
 void EditAccountDialog::accept()
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 5723319..2e1af22 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -44,8 +44,7 @@ K_EXPORT_PLUGIN(KCMTelepathyAccountsFactory("telepathy_accounts", "kcm_telepathy
 
 KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList& args)
  : KCModule(KCMTelepathyAccountsFactory::componentData(), parent, args),
-   m_accountsListModel(0),
-   m_addAccountAssistant(0)
+   m_accountsListModel(0)
 {
     kDebug();
 
@@ -96,7 +95,6 @@ KCMTelepathyAccounts::~KCMTelepathyAccounts()
     kDebug();
 
     delete m_ui;
-    // TODO: Implement me!
 }
 
 void KCMTelepathyAccounts::load()
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index a8961f7..b29fe2a 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -64,7 +64,6 @@ private:
 
     Tp::AccountManagerPtr m_accountManager;
     AccountsListModel *m_accountsListModel;
-    AddAccountAssistant *m_addAccountAssistant;
 };
 
 

-- 
ktp-accounts-kcm packaging