From 66c878697cd92f6520b21f2a471b3a673ce9b7d1 Mon Sep 17 00:00:00 2001 From: Luke De Mouy Date: Wed, 13 Jan 2016 20:38:42 -0700 Subject: [PATCH] Add Default Constructors to users and groups, and change Users to Members in the Group class. --- src/library/sysadm-usermanager.cpp | 2 +- src/library/sysadm-usermanager.h | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/library/sysadm-usermanager.cpp b/src/library/sysadm-usermanager.cpp index 18ead38..9586bf6 100644 --- a/src/library/sysadm-usermanager.cpp +++ b/src/library/sysadm-usermanager.cpp @@ -327,7 +327,7 @@ void UserManager::loadGroups() group.Name = line.section(":",0,0); group.ID = line.section(":",2,2).toInt(); QString memberString = line.section(":",3,3); - group.Users = memberString.split(","); + group.Members = memberString.split(","); groups.append(group); } diff --git a/src/library/sysadm-usermanager.h b/src/library/sysadm-usermanager.h index 3467395..cc908c8 100644 --- a/src/library/sysadm-usermanager.h +++ b/src/library/sysadm-usermanager.h @@ -13,6 +13,16 @@ namespace sysadm{ class User { public: + User() + { + FullName = ""; + UserName = ""; + ID = -1; + HomeFolder = ""; + Shell = ""; + GroupID = -1; + } + QString FullName; QString UserName; int ID; @@ -34,13 +44,20 @@ public: class Group { public: + Group() + { + ID = -1; + Name = ""; + Members = QStringList(); + } + int ID; QString Name; //While the object model would be more "correct" if //Users were to be a Vector of User pointers, it's //expensive to wire up and we don't really gain anything //from doing so - QStringList Users; + QStringList Members; }; class UserManager