Skip to content
Snippets Groups Projects
Commit 0d89d690 authored by Stepan Salenikovich's avatar Stepan Salenikovich
Browse files

person: forward callAdded signal

ContactMethod objects emit a callAdded signal when a new call is
created that ContactMethod. This patch forwards that signal to
the Person object which contains that ContactMethod, so that the
Person object can also emit a callAdded signal.

Change-Id: I913035e0610349ad810e8e29b0b585b19e05ee85
Tuleap: #956
parent def19015
Branches
No related tags found
No related merge requests found
...@@ -184,6 +184,7 @@ void PersonPrivate::registerContactMethod(ContactMethod* m) ...@@ -184,6 +184,7 @@ void PersonPrivate::registerContactMethod(ContactMethod* m)
{ {
m_HiddenContactMethods << m; m_HiddenContactMethods << m;
connect(m, &ContactMethod::lastUsedChanged, this, &PersonPrivate::slotLastUsedTimeChanged); connect(m, &ContactMethod::lastUsedChanged, this, &PersonPrivate::slotLastUsedTimeChanged);
connect(m, &ContactMethod::callAdded, this, &PersonPrivate::slotCallAdded);
if (m->lastUsed() > m_LastUsed) if (m->lastUsed() > m_LastUsed)
slotLastUsedTimeChanged(m->lastUsed()); slotLastUsedTimeChanged(m->lastUsed());
...@@ -360,6 +361,7 @@ void Person::setContactMethods(ContactMethods numbers) ...@@ -360,6 +361,7 @@ void Person::setContactMethods(ContactMethods numbers)
disconnect(n,SIGNAL(presentChanged(bool)),this,SLOT(slotPresenceChanged())); disconnect(n,SIGNAL(presentChanged(bool)),this,SLOT(slotPresenceChanged()));
disconnect(n, &ContactMethod::lastUsedChanged, d_ptr, &PersonPrivate::slotLastUsedTimeChanged); disconnect(n, &ContactMethod::lastUsedChanged, d_ptr, &PersonPrivate::slotLastUsedTimeChanged);
disconnect(n, &ContactMethod::unreadTextMessageCountChanged, d_ptr, &PersonPrivate::changed); disconnect(n, &ContactMethod::unreadTextMessageCountChanged, d_ptr, &PersonPrivate::changed);
disconnect(n, &ContactMethod::callAdded, d_ptr, &PersonPrivate::slotCallAdded);
} }
d_ptr->m_Numbers = numbers; d_ptr->m_Numbers = numbers;
...@@ -367,6 +369,7 @@ void Person::setContactMethods(ContactMethods numbers) ...@@ -367,6 +369,7 @@ void Person::setContactMethods(ContactMethods numbers)
connect(n,SIGNAL(presentChanged(bool)),this,SLOT(slotPresenceChanged())); connect(n,SIGNAL(presentChanged(bool)),this,SLOT(slotPresenceChanged()));
connect(n, &ContactMethod::lastUsedChanged, d_ptr, &PersonPrivate::slotLastUsedTimeChanged); connect(n, &ContactMethod::lastUsedChanged, d_ptr, &PersonPrivate::slotLastUsedTimeChanged);
connect(n, &ContactMethod::unreadTextMessageCountChanged, d_ptr, &PersonPrivate::changed); connect(n, &ContactMethod::unreadTextMessageCountChanged, d_ptr, &PersonPrivate::changed);
connect(n, &ContactMethod::callAdded, d_ptr, &PersonPrivate::slotCallAdded);
} }
d_ptr->phoneNumbersChanged(); d_ptr->phoneNumbersChanged();
...@@ -747,3 +750,10 @@ void PersonPrivate::slotLastUsedTimeChanged(::time_t t) ...@@ -747,3 +750,10 @@ void PersonPrivate::slotLastUsedTimeChanged(::time_t t)
emit c->lastUsedTimeChanged(t); emit c->lastUsedTimeChanged(t);
} }
} }
void PersonPrivate::slotCallAdded(Call *call)
{
foreach (Person* c,m_lParents) {
emit c->callAdded(call);
}
}
...@@ -196,6 +196,8 @@ Q_SIGNALS: ...@@ -196,6 +196,8 @@ Q_SIGNALS:
void rebased ( Person* ); void rebased ( Person* );
///The last time there was an interaction with this person changed ///The last time there was an interaction with this person changed
void lastUsedTimeChanged ( long long ) const; void lastUsedTimeChanged ( long long ) const;
///A new call used a ContactMethod associated with this Person
void callAdded ( Call* );
protected: protected:
//Presence secret methods //Presence secret methods
......
...@@ -84,5 +84,5 @@ public: ...@@ -84,5 +84,5 @@ public:
public Q_SLOTS: public Q_SLOTS:
void slotLastUsedTimeChanged(::time_t t); void slotLastUsedTimeChanged(::time_t t);
void slotCallAdded (Call *call);
}; };
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment