StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor(friendwidget): Extract Settings in variable

Browse Source
This commit is contained in:
Diadlo 2017-07-27 08:49:22 +03:00
parent bd99e10ac1
commit c3297600be
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widget/friendwidget.cpp
View File

@ -129,7 +129,8 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
groupActions[groupAction] = group;
}
int circleId = Settings::getInstance().getFriendCircleID(frnd->getPublicKey());
const Settings& s = Settings::getInstance();
int circleId = s.getFriendCircleID(frnd->getPublicKey());
CircleWidget* circleWidget = CircleWidget::getFromID(circleId);
QWidget* w = circleWidget ? circleWidget : static_cast<QWidget*>(this);
@ -142,7 +143,7 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
QAction* removeCircleAction = nullptr;
if (circleId != -1) {
const QString circleName = Settings::getInstance().getCircleName(circleId);
const QString circleName = s.getCircleName(circleId);
removeCircleAction = circleMenu->addAction(tr("Remove from circle '%1'").arg(circleName));
}
@ -151,12 +152,12 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
QList<QAction*> circleActionList;
QMap<QAction*, int> circleActions;
for (int i = 0; i < Settings::getInstance().getCircleCount(); ++i) {
for (int i = 0; i < s.getCircleCount(); ++i) {
if (i == circleId) {
continue;
}
const QString name = Settings::getInstance().getCircleName(i);
const QString name = s.getCircleName(i);
QAction* action = new QAction(tr("Move to circle \"%1\"").arg(name), circleMenu);
circleActionList.push_back(action);
circleActions[circleActionList.back()] = i;
@ -177,7 +178,7 @@ void FriendWidget::onContextMenuCalled(QContextMenuEvent* event)
QAction* autoAccept = menu.addAction(tr("Auto accept files from this friend",
"context menu entry"));
ToxPk id = frnd->getPublicKey();
QString dir = Settings::getInstance().getAutoAcceptDir(id);
QString dir = s.getAutoAcceptDir(id);
autoAccept->setCheckable(true);
autoAccept->setChecked(!dir.isEmpty());
menu.addSeparator();
@ -423,6 +424,8 @@ void FriendWidget::setAlias(const QString& _alias)
// Hack to avoid edit const Friend. TODO: Repalce on emit
Friend* f = FriendList::findFriend(frnd->getFriendId());
f->setAlias(alias);
Settings::getInstance().setFriendAlias(frnd->getPublicKey(), alias);
Settings::getInstance().savePersonal();
Settings& s = Settings::getInstance();
s.setFriendAlias(frnd->getPublicKey(), alias);
s.savePersonal();
}