From 7d84e4900fa8f4ef96e8cf4bb67b76be7902e840 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sun, 4 Apr 2021 23:42:15 +0100
Subject: Fix a ton of pedantic compiler warnings.

---
 src/modules/m_spanningtree/commands.h            | 6 +++---
 src/modules/m_spanningtree/main.h                | 2 +-
 src/modules/m_spanningtree/metadata.cpp          | 6 +++---
 src/modules/m_spanningtree/protocolinterface.cpp | 6 +++---
 src/modules/m_spanningtree/protocolinterface.h   | 6 +++---
 src/modules/m_spanningtree/treeserver.h          | 2 +-
 src/modules/m_spanningtree/utils.h               | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/modules/m_spanningtree')

diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 234776d7c..152ee25d7 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -102,9 +102,9 @@ class CommandMetadata : public ServerCommand
 	class Builder : public CmdBuilder
 	{
 	 public:
-		Builder(User* user, const std::string& key, const std::string& val);
-		Builder(Channel* chan, const std::string& key, const std::string& val);
-		Builder(Membership* memb, const std::string& key, const std::string& val);
+		Builder(const User* user, const std::string& key, const std::string& val);
+		Builder(const Channel* chan, const std::string& key, const std::string& val);
+		Builder(const Membership* memb, const std::string& key, const std::string& val);
 		Builder(const std::string& key, const std::string& val);
 	};
 };
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 0d4c32d72..7b1f8ef5b 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -220,6 +220,6 @@ class ModuleSpanningTree
 	void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) override;
 	void OnShutdown(const std::string& reason) override;
 	Cullable::Result Cull() override;
-	~ModuleSpanningTree();
+	~ModuleSpanningTree() override;
 	void Prioritize() override;
 };
diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index f250861f1..aabd4cbbc 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -110,7 +110,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
 	return CmdResult::SUCCESS;
 }
 
-CommandMetadata::Builder::Builder(User* user, const std::string& key, const std::string& val)
+CommandMetadata::Builder::Builder(const User* user, const std::string& key, const std::string& val)
 	: CmdBuilder("METADATA")
 {
 	push(user->uuid);
@@ -118,7 +118,7 @@ CommandMetadata::Builder::Builder(User* user, const std::string& key, const std:
 	push_last(val);
 }
 
-CommandMetadata::Builder::Builder(Channel* chan, const std::string& key, const std::string& val)
+CommandMetadata::Builder::Builder(const Channel* chan, const std::string& key, const std::string& val)
 	: CmdBuilder("METADATA")
 {
 	push(chan->name);
@@ -127,7 +127,7 @@ CommandMetadata::Builder::Builder(Channel* chan, const std::string& key, const s
 	push_last(val);
 }
 
-CommandMetadata::Builder::Builder(Membership* memb, const std::string& key, const std::string& val)
+CommandMetadata::Builder::Builder(const Membership* memb, const std::string& key, const std::string& val)
 	: CmdBuilder("METADATA")
 {
 	push_raw("@");
diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index 59a282378..8e0d0fd4d 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -87,17 +87,17 @@ void SpanningTreeProtocolInterface::BroadcastEncap(const std::string& cmd, const
 	CmdBuilder(source, "ENCAP * ").push_raw(cmd).insert(params).Forward(server);
 }
 
-void SpanningTreeProtocolInterface::SendMetaData(User* u, const std::string& key, const std::string& data)
+void SpanningTreeProtocolInterface::SendMetaData(const User* u, const std::string& key, const std::string& data)
 {
 	CommandMetadata::Builder(u, key, data).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendMetaData(Channel* c, const std::string& key, const std::string& data)
+void SpanningTreeProtocolInterface::SendMetaData(const Channel* c, const std::string& key, const std::string& data)
 {
 	CommandMetadata::Builder(c, key, data).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendMetaData(Membership* m, const std::string& key, const std::string& data)
+void SpanningTreeProtocolInterface::SendMetaData(const Membership* m, const std::string& key, const std::string& data)
 {
 	CommandMetadata::Builder(m, key, data).Broadcast();
 }
diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h
index b44599db0..e4cda3c84 100644
--- a/src/modules/m_spanningtree/protocolinterface.h
+++ b/src/modules/m_spanningtree/protocolinterface.h
@@ -37,9 +37,9 @@ class SpanningTreeProtocolInterface : public ProtocolInterface
 
 	bool SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const CommandBase::Params& params, User* source) override;
 	void BroadcastEncap(const std::string& cmd, const CommandBase::Params& params, User* source, User* omit) override;
-	void SendMetaData(User* user, const std::string& key, const std::string& data) override;
-	void SendMetaData(Channel* chan, const std::string& key, const std::string& data) override;
-	void SendMetaData(Membership* memb, const std::string& key, const std::string& data) override;
+	void SendMetaData(const User* user, const std::string& key, const std::string& data) override;
+	void SendMetaData(const Channel* chan, const std::string& key, const std::string& data) override;
+	void SendMetaData(const Membership* memb, const std::string& key, const std::string& data) override;
 	void SendMetaData(const std::string& key, const std::string& data) override;
 	void SendSNONotice(char snomask, const std::string& text) override;
 	void SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype) override;
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 028bbf49d..8b09f3817 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -234,7 +234,7 @@ class TreeServer : public Server
 
 	/** Destructor, deletes ServerUser unless IsRoot()
 	 */
-	~TreeServer();
+	~TreeServer() override;
 
 	/** Returns the TreeServer the given user is connected to
 	 * @param user The user whose server to return
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 2782330d5..daca8417b 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -123,7 +123,7 @@ class SpanningTreeUtilities : public Cullable
 
 	/** Destroy class and free listeners etc
 	 */
-	~SpanningTreeUtilities();
+	~SpanningTreeUtilities() override;
 
 	void RouteCommand(TreeServer* origin, CommandBase* cmd, const CommandBase::Params& parameters, User* user);
 
-- 
cgit v1.3.1-10-gc9f91