Browse Source

refactor: Add signals in settings

pull/4622/head
Diadlo 8 years ago
parent
commit
2020f7c4f8
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
  1. 37
      src/persistence/settings.cpp
  2. 4
      src/persistence/settings.h

37
src/persistence/settings.cpp

@ -1367,11 +1367,15 @@ void Settings::setAutoAcceptDir(const ToxPk& id, const QString& dir) @@ -1367,11 +1367,15 @@ void Settings::setAutoAcceptDir(const ToxPk& id, const QString& dir)
QMutexLocker locker{&bigLock};
auto it = friendLst.find(id.getKey());
if (it != friendLst.end()) {
it->autoAcceptDir = dir;
} else {
if (it == friendLst.end()) {
updateFriendAddress(id.toString());
setAutoAcceptDir(id, dir);
return;
}
if (it->autoAcceptDir != dir) {
it->autoAcceptDir = dir;
emit autoAcceptDirChanged(id, dir);
}
}
@ -1391,7 +1395,13 @@ void Settings::setAutoAcceptCall(const ToxPk& id, AutoAcceptCallFlags accept) @@ -1391,7 +1395,13 @@ void Settings::setAutoAcceptCall(const ToxPk& id, AutoAcceptCallFlags accept)
QMutexLocker locker{&bigLock};
auto it = friendLst.find(id.getKey());
if (it != friendLst.end()) {
if (it == friendLst.end()) {
updateFriendAddress(id.toString());
setAutoAcceptCall(id, accept);
return;
}
if (it->autoAcceptCall != accept) {
it->autoAcceptCall = accept;
emit autoAcceptCallChanged(id, accept);
}
@ -1414,7 +1424,13 @@ void Settings::setAutoGroupInvite(const ToxPk& id, bool accept) @@ -1414,7 +1424,13 @@ void Settings::setAutoGroupInvite(const ToxPk& id, bool accept)
QMutexLocker locker{&bigLock};
auto it = friendLst.find(id.getKey());
if (it != friendLst.end()) {
if (it == friendLst.end()) {
updateFriendAddress(id.toString());
setAutoGroupInvite(id, accept);
return;
}
if (it->autoGroupInvite != accept) {
it->autoGroupInvite = accept;
emit autoGroupInviteChanged(id, accept);
}
@ -1436,12 +1452,15 @@ void Settings::setContactNote(const ToxPk& id, const QString& note) @@ -1436,12 +1452,15 @@ void Settings::setContactNote(const ToxPk& id, const QString& note)
QMutexLocker locker{&bigLock};
auto it = friendLst.find(id.getKey());
if (it != friendLst.end()) {
qDebug() << note;
it->note = note;
} else {
if (it == friendLst.end()) {
updateFriendAddress(id.toString());
setContactNote(id, note);
return;
}
if (it->note != note) {
it->note = note;
emit contactNoteChanged(id, note);
}
}

4
src/persistence/settings.h

@ -193,8 +193,12 @@ signals: @@ -193,8 +193,12 @@ signals:
void globalAutoAcceptDirChanged(const QString& path);
void checkUpdatesChanged(bool enabled);
void widgetDataChanged(const QString& key);
// Friend
void autoAcceptCallChanged(const ToxPk& id, AutoAcceptCallFlags accept);
void autoGroupInviteChanged(const ToxPk& id, bool accept);
void autoAcceptDirChanged(const ToxPk& id, const QString& dir);
void contactNoteChanged(const ToxPk& id, const QString& note);
// GUI
void autoLoginChanged(bool enabled);

Loading…
Cancel
Save