Remove SpanningTreeProtocolInterface::SendOperNotice - it was translated to a SendSNONotice 'A' anyway, and only used by SAMODE, which duplicated it with a SendSNONotice 'A' also anyhow o.o - this means OPERNOTICE is now gone from protocol 1200, and SNONOTICE should be used instead.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9530 e03df62e-2008-0410-955e-edbf42e46eb7

5 files changed, 0 insertions, 18 deletions

diff --git a/include/protocol.h b/include/protocol.h
index 9ceb438a1..16e347ad2 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -47,8 +47,6 @@ class ProtocolInterface : public Extensible
 		SendMode(target, n);
 	}
 
-	virtual void SendOperNotice(const std::string &text) { }
-
 	virtual void SendModeNotice(const std::string &modes, const std::string &text) { }
 
 	virtual void SendSNONotice(const std::string &snomask, const std::string &text) { }
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 84540b117..3dcd48ca5 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -47,8 +47,6 @@ class CommandSamode : public Command
 			n.pop_front();
 			ServerInstance->PI->SendMode(channel, n);
 
-			ServerInstance->PI->SendOperNotice(std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
-
 			/* XXX: Yes, this is right. We dont want to propagate the
 			 * actual SAMODE command, just the MODE command generated
 			 * by the Protocol Interface
diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index cbffe92cc..7aed1ddfa 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -79,13 +79,6 @@ void SpanningTreeProtocolInterface::SendMode(const std::string &target, paramete
 	}
 }
 
-void SpanningTreeProtocolInterface::SendOperNotice(const std::string &text)
-{
-	parameterlist p;
-	p.push_back(":" + text);
-	Utils->DoOneToMany(ServerInstance->Config->GetSID(), "OPERNOTICE", p);
-}
-
 void SpanningTreeProtocolInterface::SendModeNotice(const std::string &modes, const std::string &text)
 {
 	parameterlist p;
diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h
index ab6270772..60f961a22 100644
--- a/src/modules/m_spanningtree/protocolinterface.h
+++ b/src/modules/m_spanningtree/protocolinterface.h
@@ -18,7 +18,6 @@ class SpanningTreeProtocolInterface : public ProtocolInterface
         virtual void SendMetaData(void* target, int type, const std::string &key, const std::string &data);
         virtual void SendTopic(Channel* channel, std::string &topic);
         virtual void SendMode(const std::string &target, parameterlist &modedata);
-        virtual void SendOperNotice(const std::string &text);
         virtual void SendModeNotice(const std::string &modes, const std::string &text);
         virtual void SendSNONotice(const std::string &snomask, const std::string &text);
         virtual void PushToClient(User* target, const std::string &rawline);
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 3d4f70c5e..8700d57a2 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -477,12 +477,6 @@ bool TreeSocket::ProcessLine(std::string &line)
 				}
 				return true;
 			}
-			else if (command == "OPERNOTICE")
-			{
-				if (params.size() >= 1)
-					Instance->SNO->WriteToSnoMask('A', "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": " + params[0]);
-				return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
-			}
 			else if (command == "MODENOTICE")
 			{
 				if (params.size() >= 2)