From fa6109b3734ed4c21056cf6cf58af60d2388e4e8 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 15 Feb 2019 23:15:56 +0000
Subject: Replace translation macros with a C++11 initialiser list.

---
 src/modules/m_callerid.cpp | 2 +-
 src/modules/m_chghost.cpp  | 2 +-
 src/modules/m_chgident.cpp | 2 +-
 src/modules/m_chgname.cpp  | 2 +-
 src/modules/m_nicklock.cpp | 4 ++--
 src/modules/m_remove.cpp   | 4 ++--
 src/modules/m_sajoin.cpp   | 2 +-
 src/modules/m_sakick.cpp   | 2 +-
 src/modules/m_sanick.cpp   | 2 +-
 src/modules/m_sapart.cpp   | 2 +-
 src/modules/m_saquit.cpp   | 2 +-
 src/modules/m_silence.cpp  | 2 +-
 src/modules/m_swhois.cpp   | 2 +-
 src/modules/m_uninvite.cpp | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 4ee2a4492..b8ffd6f62 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -180,7 +180,7 @@ public:
 	{
 		allow_empty_last_param = false;
 		syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]";
-		TRANSLATE1(TR_CUSTOM);
+		translation = { TR_CUSTOM };
 	}
 
 	void EncodeParameter(std::string& parameter, unsigned int index) override
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 4b7b144f2..46e644551 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -34,7 +34,7 @@ class CommandChghost : public Command
 		allow_empty_last_param = false;
 		flags_needed = 'o';
 		syntax = "<nick> <newhost>";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 95ba9e8d1..28a144336 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -32,7 +32,7 @@ class CommandChgident : public Command
 		allow_empty_last_param = false;
 		flags_needed = 'o';
 		syntax = "<nick> <newident>";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index b17ef9888..65999b142 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -30,7 +30,7 @@ class CommandChgname : public Command
 		allow_empty_last_param = false;
 		flags_needed = 'o';
 		syntax = "<nick> <new real name>";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index de1ad303e..987dea86d 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -41,7 +41,7 @@ class CommandNicklock : public Command
 	{
 		flags_needed = 'o';
 		syntax = "<oldnick> <newnick>";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
@@ -101,7 +101,7 @@ class CommandNickunlock : public Command
 	{
 		flags_needed = 'o';
 		syntax = "<locked-nick>";
-		TRANSLATE1(TR_NICK);
+		translation = { TR_NICK };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index a163e6dc8..eca43ff1c 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -166,7 +166,7 @@ class CommandRemove : public RemoveBase
 		: RemoveBase(Creator, snk, nkm, "REMOVE")
 	{
 		syntax = "<channel> <nick> [<reason>]";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
@@ -184,7 +184,7 @@ class CommandFpart : public RemoveBase
 		: RemoveBase(Creator, snk, nkm, "FPART")
 	{
 		syntax = "<channel> <nick> [<reason>]";
-		TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
+		translation = { TR_TEXT, TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 476be27cf..2ed66f9fd 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -30,7 +30,7 @@ class CommandSajoin : public Command
 	{
 		allow_empty_last_param = false;
 		flags_needed = 'o'; syntax = "[<nick>] <channel>[,<channel>]";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 4970374c4..af336ed8d 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -28,7 +28,7 @@ class CommandSakick : public Command
 	CommandSakick(Module* Creator) : Command(Creator,"SAKICK", 2, 3)
 	{
 		flags_needed = 'o'; syntax = "<channel> <nick> [reason]";
-		TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
+		translation = { TR_TEXT, TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index c5fbe1a1c..3d809f5d4 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -30,7 +30,7 @@ class CommandSanick : public Command
 	{
 		allow_empty_last_param = false;
 		flags_needed = 'o'; syntax = "<nick> <new-nick>";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 7d1ef8a86..484bb44e3 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -29,7 +29,7 @@ class CommandSapart : public Command
 	CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
 	{
 		flags_needed = 'o'; syntax = "<nick> <channel>[,<channel>] [reason]";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 40440359e..6b9af2baf 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -29,7 +29,7 @@ class CommandSaquit : public Command
 	CommandSaquit(Module* Creator) : Command(Creator, "SAQUIT", 2, 2)
 	{
 		flags_needed = 'o'; syntax = "<nick> <reason>";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index b650cf91d..5c4a8c630 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -75,7 +75,7 @@ class CommandSVSSilence : public Command
 	CommandSVSSilence(Module* Creator) : Command(Creator,"SVSSILENCE", 2)
 	{
 		syntax = "<target> {[+|-]<mask> <p|c|i|n|t|a|x>}";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 0bfb599b4..5bc41dd79 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -45,7 +45,7 @@ class CommandSwhois : public Command
 		, swhois("swhois", ExtensionItem::EXT_USER, Creator)
 	{
 		flags_needed = 'o'; syntax = "<nick> :<swhois>";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 0df60f08a..5d4fb07a5 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -40,7 +40,7 @@ class CommandUninvite : public Command
 		, invapi(Creator)
 	{
 		syntax = "<nick> <channel>";
-		TRANSLATE2(TR_NICK, TR_TEXT);
+		translation = { TR_NICK, TR_TEXT };
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) override
-- 
cgit v1.3.1-10-gc9f91