Skip to content
This repository was archived by the owner on Aug 16, 2024. It is now read-only.

Commit e6a45b0

Browse files
committed
重构数个定义;
1 parent 4590d4e commit e6a45b0

File tree

4 files changed

+2
-70
lines changed

4 files changed

+2
-70
lines changed

include/defs/friend.hpp

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,9 @@ namespace Cyan
1616
QQ_t QQ;
1717
string NickName;
1818
string Remark;
19-
20-
Friend_t() = default;
21-
Friend_t(const Friend_t& f)
22-
{
23-
QQ = f.QQ;
24-
NickName = f.NickName;
25-
Remark = f.Remark;
26-
}
27-
Friend_t& operator=(const Friend_t& t)
28-
{
29-
Friend_t tmp(t);
30-
std::swap(this->QQ, tmp.QQ);
31-
std::swap(this->NickName, tmp.NickName);
32-
std::swap(this->Remark, tmp.Remark);
33-
return *this;
34-
}
35-
virtual ~Friend_t() = default;
3619
virtual bool Set(const json& j) override
3720
{
38-
QQ = (QQ_t)(j["id"].get<int64_t>());
21+
QQ = QQ_t(j["id"].get<int64_t>());
3922
NickName = j["nickname"].get<string>();
4023
Remark = j["remark"].get<string>();
4124
return true;

include/defs/group.hpp

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,9 @@ namespace Cyan
1616
GID_t GID;
1717
string Name;
1818
GroupPermission Permission;
19-
20-
Group_t() = default;
21-
Group_t(const Group_t& g)
22-
{
23-
GID = g.GID;
24-
Name = g.Name;
25-
Permission = g.Permission;
26-
}
27-
Group_t& operator=(const Group_t& t)
28-
{
29-
Group_t tmp(t);
30-
std::swap(this->GID, tmp.GID);
31-
std::swap(this->Name, tmp.Name);
32-
std::swap(this->Permission, tmp.Permission);
33-
return *this;
34-
}
35-
virtual ~Group_t() = default;
3619
virtual bool Set(const json& j) override
3720
{
38-
GID = (GID_t)(j["id"].get<int64_t>());
21+
GID = GID_t(j["id"].get<int64_t>());
3922
Name = j["name"].get<string>();
4023
Permission = GroupPermissionStr(j["permission"].get<string>());
4124
return true;

include/defs/group_member.hpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,6 @@ namespace Cyan
1818
string MemberName;
1919
GroupPermission Permission;
2020
Group_t Group;
21-
22-
GroupMember_t() = default;
23-
GroupMember_t(const GroupMember_t& gm)
24-
{
25-
QQ = gm.QQ;
26-
MemberName = gm.MemberName;
27-
Permission = gm.Permission;
28-
Group = gm.Group;
29-
}
30-
GroupMember_t& operator=(const GroupMember_t& t)
31-
{
32-
GroupMember_t tmp(t);
33-
std::swap(this->QQ, tmp.QQ);
34-
std::swap(this->MemberName, tmp.MemberName);
35-
std::swap(this->Permission, tmp.Permission);
36-
std::swap(this->Group, tmp.Group);
37-
return *this;
38-
}
39-
virtual ~GroupMember_t() = default;
4021
virtual bool Set(const json& j) override
4122
{
4223
QQ = (QQ_t)(j["id"].get<int64_t>());

include/defs/group_member_info.hpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,6 @@ namespace Cyan
1616
public:
1717
string Name;
1818
string SpecialTitle;
19-
20-
GroupMemberInfo() = default;
21-
GroupMemberInfo(const GroupMemberInfo& gm)
22-
{
23-
Name = gm.Name;
24-
SpecialTitle = gm.SpecialTitle;
25-
}
26-
GroupMemberInfo& operator=(const GroupMemberInfo& t)
27-
{
28-
GroupMemberInfo tmp(t);
29-
std::swap(this->Name, tmp.Name);
30-
std::swap(this->SpecialTitle, tmp.SpecialTitle);
31-
return *this;
32-
}
33-
virtual ~GroupMemberInfo() = default;
3419
virtual bool Set(const json& j) override
3520
{
3621
Name = j["name"].get<string>();

0 commit comments

Comments
 (0)