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

The following commit has been merged in the master branch:
commit f1396cb6bc699abf2eceb2e50a22d6f990d02e9a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Oct 1 01:20:48 2012 +0100

    Remove unusued (weird) code in accounts model
---
 src/account-item.cpp        | 5 -----
 src/account-item.h          | 4 ----
 src/accounts-list-model.cpp | 6 ------
 src/accounts-list-model.h   | 6 ------
 4 files changed, 21 deletions(-)

diff --git a/src/account-item.cpp b/src/account-item.cpp
index f67ecf6..0c8e73e 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -169,11 +169,6 @@ void AccountItem::generateIcon()
     Q_EMIT(updated());
 }
 
-void AccountItem::onTitleForCustomPages(QString mandatoryPage, QList<QString> optionalPage)
-{
-    Q_EMIT setTitleForCustomPages(mandatoryPage, optionalPage);
-}
-
 Tp::ConnectionStatus AccountItem::connectionStatus() const
 {
     return m_account->connectionStatus();
diff --git a/src/account-item.h b/src/account-item.h
index b84adee..c8ff9a0 100644
--- a/src/account-item.h
+++ b/src/account-item.h
@@ -49,15 +49,11 @@ public:
     const QString connectionStatusReason() const;
     const QString connectionProtocolName() const;
 
-public Q_SLOTS:
-    void onTitleForCustomPages(QString, QList<QString>);
-
 Q_SIGNALS:
     void ready();
     void removed();
     void updated();
     void protocolSelected(QString, QString);
-    void setTitleForCustomPages(QString, QList<QString>);
 
 private Q_SLOTS:
     void generateIcon();
diff --git a/src/accounts-list-model.cpp b/src/accounts-list-model.cpp
index 345aaec..1073882 100644
--- a/src/accounts-list-model.cpp
+++ b/src/accounts-list-model.cpp
@@ -221,10 +221,4 @@ void AccountsListModel::onAccountItemUpdated()
     Q_EMIT dataChanged(index, index);
 }
 
-void AccountsListModel::onTitleForCustomPages(QString mandatoryPage, QList<QString> optionalPage)
-{
-    Q_EMIT setTitleForCustomPages(mandatoryPage, optionalPage);
-}
-
-
 #include "accounts-list-model.moc"
diff --git a/src/accounts-list-model.h b/src/accounts-list-model.h
index 8937354..ee8ce22 100644
--- a/src/accounts-list-model.h
+++ b/src/accounts-list-model.h
@@ -52,12 +52,6 @@ public:
     virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
     void addAccount(const Tp::AccountPtr &account);
 
-Q_SIGNALS:
-    void setTitleForCustomPages(QString, QList<QString>);
-
-public Q_SLOTS:
-    void onTitleForCustomPages(QString, QList<QString>);
-
 private Q_SLOTS:
     void onAccountItemRemoved();
     void onAccountItemUpdated();

-- 
ktp-accounts-kcm packaging