Assign more class members inline instead of in the constructor.

8 files changed, 13 insertions, 29 deletions

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 9225374f4..9abeee56d 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -274,7 +274,8 @@ bool irc::sepstream::Contains(const std::string& value)
 }
 
 irc::portparser::portparser(const std::string& source, bool allow_overlapped)
-	: sep(source), in_range(0), range_begin(0), range_end(0), overlapped(allow_overlapped)
+	: sep(source)
+	, overlapped(allow_overlapped)
 {
 }
 
diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 4b9eb6299..c1c617538 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -57,7 +57,7 @@ private:
 	ClientProtocol::Events::Join extendedjoinmsg;
 
 public:
-	const std::string asterisk;
+	const std::string asterisk = "*";
 	ClientProtocol::EventProvider awayprotoev;
 	AwayMessage awaymsg;
 	Cap::Capability extendedjoincap;
@@ -66,7 +66,6 @@ public:
 	JoinHook(Module* mod)
 		: ClientProtocol::EventHook(mod, "JOIN")
 		, accountapi(mod)
-		, asterisk(1, '*')
 		, awayprotoev(mod, "AWAY")
 		, extendedjoincap(mod, "extended-join")
 		, awaycap(mod, "away-notify")
diff --git a/src/modules/m_spanningtree/commandbuilder.h b/src/modules/m_spanningtree/commandbuilder.h
index 6843c47d1..dc9bbda6e 100644
--- a/src/modules/m_spanningtree/commandbuilder.h
+++ b/src/modules/m_spanningtree/commandbuilder.h
@@ -29,7 +29,7 @@ class CmdBuilder
 {
 protected:
 	/** The raw message contents. */
-	std::string content;
+	std::string content = ":";
 
 	/** Tags which have been added to this message. */
 	ClientProtocol::TagMap tags;
@@ -48,7 +48,6 @@ protected:
 
 public:
 	CmdBuilder(const char* cmd)
-		: content(1, ':')
 	{
 		content.append(ServerInstance->Config->GetSID());
 		push(cmd);
@@ -56,7 +55,6 @@ public:
 	}
 
 	CmdBuilder(TreeServer* src, const char* cmd)
-		: content(1, ':')
 	{
 		content.append(src->GetId());
 		push(cmd);
@@ -64,7 +62,6 @@ public:
 	}
 
 	CmdBuilder(User* src, const char* cmd)
-		: content(1, ':')
 	{
 		content.append(src->uuid);
 		push(cmd);
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index a47dbb275..98838c3f2 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -37,9 +37,6 @@
  */
 TreeServer::TreeServer()
 	: Server(ServerInstance->Config->GetSID(), ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc)
-	, Parent(nullptr), Route(nullptr)
-	, Socket(nullptr)
-	, behind_bursting(0)
 	, pingtimer(this)
 	, ServerUser(ServerInstance->FakeClient)
 	, age(ServerInstance->Time())
@@ -47,7 +44,6 @@ TreeServer::TreeServer()
 	, customversion(ServerInstance->Config->CustomVersion)
 	, rawbranch(INSPIRCD_BRANCH)
 	, rawversion(INSPIRCD_VERSION)
-	, Hidden(false)
 {
 	AddHashEntry();
 }
@@ -64,7 +60,6 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
 	, pingtimer(this)
 	, ServerUser(new FakeUser(id, this))
 	, age(ServerInstance->Time())
-	, UserCount(0)
 	, Hidden(Hide)
 {
 	ServerInstance->Logs.Debug(MODNAME, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting);
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index bc55441cf..aefe44637 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -46,17 +46,17 @@
 class TreeServer final
 	: public Server
 {
-	TreeServer* Parent;			/* Parent entry */
-	TreeServer* Route;			/* Route entry */
+	TreeServer* Parent = nullptr;		/* Parent entry */
+	TreeServer* Route = nullptr;		/* Route entry */
 	std::vector<TreeServer*> Children;	/* List of child objects */
-	TreeSocket* Socket;			/* Socket used to communicate with this server */
+	TreeSocket* Socket = nullptr;		/* Socket used to communicate with this server */
 
 	/** Counter counting how many servers are bursting in front of this server, including
 	 * this server. Set to parents' value on construction then it is increased if the
 	 * server itself starts bursting. Decreased when a server on the path to this server
 	 * finishes burst.
 	 */
-	unsigned int behind_bursting;
+	unsigned int behind_bursting = 0;
 
 	/** True if this server has been lost in a split and is awaiting destruction
 	 */
@@ -84,7 +84,7 @@ public:
 	FakeUser* const ServerUser;		/* User representing this server */
 	const time_t age;
 
-	size_t UserCount;			/* How many users are on this server? [note: doesn't care about +i] */
+	size_t UserCount = 0;			/* How many users are on this server? [note: doesn't care about +i] */
 	size_t OperCount = 0;			/* How many opers are on this server? */
 
 	std::string customversion;
@@ -150,7 +150,7 @@ public:
 
 	/** True if this server is hidden
 	 */
-	bool Hidden;
+	bool Hidden = false;
 
 	/** Get the TreeSocket pointer for local servers.
 	 * For remote servers, this returns NULL.
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index d31d978f3..427c3b719 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -85,7 +85,7 @@ struct CapabData final
 	std::map<std::string,std::string> CapKeys;	/* CAPAB keys from other server */
 	std::string ourchallenge;		/* Challenge sent for challenge/response */
 	std::string theirchallenge;		/* Challenge recv for challenge/response */
-	int capab_phase;			/* Have sent CAPAB already */
+	int capab_phase = 0;			/* Have sent CAPAB already */
 	bool auth_fingerprint;			/* Did we auth using a client certificate fingerprint */
 	bool auth_challenge;			/* Did we auth using challenge/response */
 	irc::sockets::sockaddrs remotesa; /* The remote socket address. */
@@ -97,8 +97,7 @@ struct CapabData final
 	bool hidden;
 
 	CapabData(const irc::sockets::sockaddrs& sa)
-		: capab_phase(0)
-		, remotesa(sa)
+		: remotesa(sa)
 	{
 	}
 };
diff --git a/src/timer.cpp b/src/timer.cpp
index c66598f37..8e1d01a56 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -35,8 +35,7 @@ void Timer::SetInterval(unsigned long newinterval)
 }
 
 Timer::Timer(unsigned long secs_from_now, bool repeating)
-	: trigger(0)
-	, secs(secs_from_now)
+	: secs(secs_from_now)
 	, repeat(repeating)
 {
 }
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index a6af76c26..304459566 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -108,12 +108,6 @@ namespace
 	}
 }
 
-UserManager::UserManager()
-	: already_sent_id(0)
-	, unregistered_count(0)
-{
-}
-
 UserManager::~UserManager()
 {
 	for (const auto& [_, client] : clientlist)