Skip to content
Snippets Groups Projects
Commit 5a4d864e authored by Guillaume Roguez's avatar Guillaume Roguez Committed by Nicolas Jager
Browse files

PhoneDirectoryModel: remove incomingMessage slot


IM has nothing related to a PhoneDirectory.
IM signals are already handled by media::Text class.
Code duplication that may results to bugs.

Change-Id: Ie4d26d76d7267ab73a46f4fc5224a4b52e0466bd
Reviewed-by: default avatarNicolas Jäger <nicolas.jager@savoirfairelinux.com>
parent c7695063
No related branches found
No related tags found
No related merge requests found
......@@ -58,8 +58,6 @@ PhoneDirectoryModel::PhoneDirectoryModel(QObject* parent) :
setObjectName("PhoneDirectoryModel");
connect(&PresenceManager::instance(),SIGNAL(newBuddyNotification(QString,QString,bool,QString)),d_ptr.data(),
SLOT(slotNewBuddySubscription(QString,QString,bool,QString)));
connect(&ConfigurationManager::instance(), SIGNAL(incomingAccountMessage(QString,QString,MapStringString)), d_ptr.data(),
SLOT(slotIncomingAccountMessage(QString, QString, MapStringString)));
}
PhoneDirectoryModel::~PhoneDirectoryModel()
......@@ -772,13 +770,6 @@ void PhoneDirectoryModelPrivate::slotContactChanged(Person* newContact, Person*
emit q_ptr->contactChanged(cm, newContact, oldContact);
}
void PhoneDirectoryModelPrivate::slotIncomingAccountMessage(const QString& account, const QString& from, const MapStringString& msg)
{
if(auto cm = q_ptr->getNumber(from, AccountModel::instance().getById(account.toLatin1()))) {
emit q_ptr->incomingMessage(cm, msg);
}
}
void PhoneDirectoryModelPrivate::slotNewBuddySubscription(const QString& accountId, const QString& uri, bool status, const QString& message)
{
ContactMethod* number = q_ptr->getNumber(uri,AccountModel::instance().getById(accountId.toLatin1()));
......
......@@ -111,7 +111,6 @@ private:
Q_SIGNALS:
void lastUsedChanged(ContactMethod* cm, time_t t);
void contactChanged(ContactMethod* cm, Person* newContact, Person* oldContact);
void incomingMessage(ContactMethod* cm, const QMap<QString, QString>& payloads);
void contactMethodMerged(ContactMethod* cm, ContactMethod* into);
};
Q_DECLARE_METATYPE(PhoneDirectoryModel*)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment