Replace most usages of "GECOS" with "real" or "real name".

5 files changed, 19 insertions, 19 deletions

diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 6af0c7c55..2447024a1 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -45,9 +45,9 @@ namespace WhoWas
 		 */
 		const std::string server;
 
-		/** Full name (GECOS)
+		/** Real name
 		 */
-		const std::string gecos;
+		const std::string real;
 
 		/** Signon time
 		 */
diff --git a/include/configreader.h b/include/configreader.h
index b603f2e10..81ec014a0 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -103,8 +103,8 @@ class ServerLimits
 	size_t MaxTopic;
 	/** Maximum kick message length */
 	size_t MaxKick;
-	/** Maximum GECOS (real name) length */
-	size_t MaxGecos;
+	/** Maximum real name length */
+	size_t MaxReal;
 	/** Maximum away message length */
 	size_t MaxAway;
 	/** Maximum line length */
diff --git a/include/modules.h b/include/modules.h
index 432e70752..302c2e4d7 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -222,7 +222,7 @@ enum Implementation
 	I_OnRawMode, I_OnCheckKey, I_OnCheckLimit, I_OnCheckBan, I_OnCheckChannelBan, I_OnExtBanCheck,
 	I_OnChangeLocalUserHost, I_OnPreTopicChange,
 	I_OnPostTopicChange, I_OnPostConnect, I_OnPostDeoper,
-	I_OnChangeLocalUserGECOS, I_OnUserRegister, I_OnChannelPreDelete, I_OnChannelDelete,
+	I_OnPreChangeRealName, I_OnUserRegister, I_OnChannelPreDelete, I_OnChannelDelete,
 	I_OnPostOper, I_OnSetAway, I_OnPostCommand, I_OnPostJoin,
 	I_OnBuildNeighborList, I_OnGarbageCollect, I_OnSetConnectClass,
 	I_OnUserMessage, I_OnPassCompare, I_OnNamesListItem, I_OnNumeric,
@@ -580,12 +580,12 @@ class CoreExport Module : public classbase, public usecountbase
 	 */
 	virtual void OnChangeHost(User* user, const std::string &newhost);
 
-	/** Called whenever a user's GECOS (realname) is changed.
+	/** Called whenever a user's real name is changed.
 	 * This event triggers after the name has been set.
-	 * @param user The user who's GECOS is being changed
-	 * @param gecos The new GECOS being set on the user
+	 * @param user The user who's real name is being changed
+	 * @param name The new real name being set on the user
 	 */
-	virtual void OnChangeName(User* user, const std::string &gecos);
+	virtual void OnChangeName(User* user, const std::string& real);
 
 	/** Called whenever a user's IDENT is changed.
 	 * This event triggers after the name has been set.
@@ -841,13 +841,13 @@ class CoreExport Module : public classbase, public usecountbase
 	 */
 	virtual ModResult OnChangeLocalUserHost(LocalUser* user, const std::string &newhost);
 
-	/** Called whenever a change of a local users GECOS (fullname field) is attempted.
-	 * return 1 to deny the name change, or 0 to allow it.
-	 * @param user The user whos GECOS will be changed
-	 * @param newhost The new GECOS
-	 * @return 1 to deny the GECOS change, 0 to allow
+	/** Called whenever a change of a local users real name is attempted.
+	 * return MOD_RES_DENY to deny the name change, or MOD_RES_ALLOW to allow it.
+	 * @param user The user whos real name will be changed
+	 * @param newhost The new real name.
+	 * @return MOD_RES_DENY to deny the real name change, MOD_RES_ALLOW to allow
 	 */
-	virtual ModResult OnChangeLocalUserGECOS(LocalUser* user, const std::string &newhost);
+	virtual ModResult OnPreChangeRealName(LocalUser* user, const std::string &newhost);
 
 	/** Called before a topic is changed.
 	 * Return 1 to deny the topic change, 0 to check details on the change, -1 to let it through with no checks
diff --git a/include/modules/sql.h b/include/modules/sql.h
index 59955107d..1f5bb7ff3 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -260,7 +260,7 @@ inline void SQL::PopulateUserInfo(User* user, ParamMap& userinfo)
 	userinfo["nick"] = user->nick;
 	userinfo["host"] = user->GetRealHost();
 	userinfo["ip"] = user->GetIPString();
-	userinfo["gecos"] = user->fullname;
+	userinfo["real"] = user->fullname;
 	userinfo["ident"] = user->ident;
 	userinfo["server"] = user->server->GetName();
 	userinfo["uuid"] = user->uuid;
diff --git a/include/users.h b/include/users.h
index 88858b160..bcddab1bf 100644
--- a/include/users.h
+++ b/include/users.h
@@ -308,7 +308,7 @@ class CoreExport User : public Extensible
 	 */
 	std::string ident;
 
-	/** The users full name (GECOS).
+	/** The users full name.
 	 */
 	std::string fullname;
 
@@ -707,10 +707,10 @@ class CoreExport User : public Extensible
 	 * ALWAYS use this function, rather than writing User::fullname directly,
 	 * as this triggers module events allowing the change to be syncronized to
 	 * remote servers.
-	 * @param gecos The user's new realname
+	 * @param real The user's new real name
 	 * @return True if the change succeeded, false if otherwise
 	 */
-	bool ChangeName(const std::string& gecos);
+	bool ChangeName(const std::string& real);
 
 	/** Change a user's nick
 	 * @param newnick The new nick. If equal to the users uuid, the nick change always succeeds.