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): Remove friendId field

Browse Source
This commit is contained in:
Diadlo 2017-07-26 17:45:06 +03:00
parent 1b07cd553e
commit fe4a89d906
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widget/friendwidget.h
View File

@ -57,13 +57,7 @@ protected:
void setFriendAlias(); void setFriendAlias();
public: public:
<<<<<<< HEAD
const Friend* frnd; const Friend* frnd;
||||||| merged common ancestors
=======
Friend* frnd;
>>>>>>> refactor(friendwidget): FriendWidget refactoring
int friendId;
bool isDefaultAvatar; bool isDefaultAvatar;
bool historyLoaded; bool historyLoaded;
}; };