Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

6 files changed, 3 insertions, 9 deletions

diff --git a/src/protocol/bahamut.cpp b/src/protocol/bahamut.cpp
index d55a08123..d9f575846 100644
--- a/src/protocol/bahamut.cpp
+++ b/src/protocol/bahamut.cpp
@@ -803,7 +803,6 @@ class ProtoBahamut : public Module
 	ProtoBahamut(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*");
diff --git a/src/protocol/inspircd11.cpp b/src/protocol/inspircd11.cpp
index 09c329f0c..a5deafec7 100644
--- a/src/protocol/inspircd11.cpp
+++ b/src/protocol/inspircd11.cpp
@@ -248,7 +248,7 @@ class InspIRCdProto : public IRCDProto
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(NULL, "BURST");
-		send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
+		send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), Anope::Build().c_str());
 	}
 
 	/* CHGIDENT */
@@ -1160,7 +1160,6 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("InspIRCd 1.1");
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 9a9f88fea..aa7d6a019 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -252,7 +252,7 @@ class InspIRCdProto : public IRCDProto
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(TS6SID, "BURST");
-		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
+		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), Anope::Build().c_str());
 	}
 
 	/* CHGIDENT */
@@ -1370,7 +1370,6 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/inspircd20.cpp b/src/protocol/inspircd20.cpp
index 4d333658c..7974fade0 100644
--- a/src/protocol/inspircd20.cpp
+++ b/src/protocol/inspircd20.cpp
@@ -251,7 +251,7 @@ class InspIRCdProto : public IRCDProto
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(TS6SID, "BURST");
-		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
+		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), Anope::Build().c_str());
 	}
 
 	/* CHGIDENT */
@@ -1369,7 +1369,6 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/ratbox.cpp b/src/protocol/ratbox.cpp
index 339113e33..41759e79b 100644
--- a/src/protocol/ratbox.cpp
+++ b/src/protocol/ratbox.cpp
@@ -869,7 +869,6 @@ class ProtoRatbox : public Module
 	ProtoRatbox(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/unreal32.cpp b/src/protocol/unreal32.cpp
index 65ee9d3e2..99a156f00 100644
--- a/src/protocol/unreal32.cpp
+++ b/src/protocol/unreal32.cpp
@@ -1319,7 +1319,6 @@ class ProtoUnreal : public Module
 	ProtoUnreal(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("UnrealIRCd 3.2+");