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: Remove ContactInfo and it's usage

Browse Source
This commit is contained in:
Diadlo 2018-12-24 21:27:20 +03:00
parent c11b3730c9
commit 65a5b5121d
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/widget/contentdialogmanager.cpp
View File

@ -11,17 +11,6 @@
namespace namespace
{ {
void removeDialog(ContentDialog* dialog, QHash<int, ContactInfo>& infos)
{
for (auto it = infos.begin(); it != infos.end();) {
if (std::get<0>(*it) == dialog) {
it = infos.erase(it);
} else {
++it;
}
}
}
void removeDialog(ContentDialog* dialog, QHash<int, ContentDialog*>& dialogs) void removeDialog(ContentDialog* dialog, QHash<int, ContentDialog*>& dialogs)
{ {
for (auto it = dialogs.begin(); it != dialogs.end();) { for (auto it = dialogs.begin(); it != dialogs.end();) {
@ -73,7 +62,6 @@ FriendWidget* ContentDialogManager::addFriendToDialog(ContentDialog* dialog,
} }
friendDialogs[friendId] = dialog; friendDialogs[friendId] = dialog;
friendList.insert(friendId, std::make_tuple(dialog, friendWidget));
return friendWidget; return friendWidget;
} }
@ -89,22 +77,9 @@ GroupWidget* ContentDialogManager::addGroupToDialog(ContentDialog* dialog,
} }
groupDialogs[groupId] = dialog; groupDialogs[groupId] = dialog;
groupList.insert(groupId, std::make_tuple(dialog, groupWidget));
return groupWidget; return groupWidget;
} }
/**
* @brief Check, if widget is exists.
* @param id User Id.
* @param list List with contact info.
* @return True is widget exists, false otherwise.
*/
bool ContentDialogManager::existsWidget(int id, const QHash<int, ContactInfo>& list)
{
auto iter = list.find(id);
return iter != list.end();
}
void ContentDialogManager::focusFriend(int friendId) void ContentDialogManager::focusFriend(int friendId)
{ {
auto dialog = focusDialog(friendId, friendDialogs); auto dialog = focusDialog(friendId, friendDialogs);
@ -243,9 +218,6 @@ void ContentDialogManager::onDialogClose()
currentDialog = nullptr; currentDialog = nullptr;
} }
removeDialog(dialog, friendList);
removeDialog(dialog, groupList);
removeDialog(dialog, friendDialogs); removeDialog(dialog, friendDialogs);
removeDialog(dialog, groupDialogs); removeDialog(dialog, groupDialogs);
} }

4
src/widget/contentdialogmanager.h
View File

@ -56,16 +56,12 @@ private slots:
private: private:
ContentDialog* focusDialog(int id, const QHash<int, ContentDialog*>& list); ContentDialog* focusDialog(int id, const QHash<int, ContentDialog*>& list);
bool existsWidget(int id, const QHash<int, ContactInfo>& list);
ContentDialog* currentDialog = nullptr; ContentDialog* currentDialog = nullptr;
QHash<int, ContentDialog*> friendDialogs; QHash<int, ContentDialog*> friendDialogs;
QHash<int, ContentDialog*> groupDialogs; QHash<int, ContentDialog*> groupDialogs;
QHash<int, ContactInfo> friendList;
QHash<int, ContactInfo> groupList;
static ContentDialogManager* instance; static ContentDialogManager* instance;
}; };