Remove SpanningTreeProtocolInterface::SendOperNotice - it was translated to a SendSNO...

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

diff --git a/include/protocol.h b/include/protocol.h
index 9ceb438a1bff27c2eae2c9cd0cb60a6413bead02..16e347ad2481e818c08bce8fcfb5e46826b22d12 100644 (file)
--- 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 84540b1178d6d325f1355048e189b5ca84b5b673..3dcd48ca5e872260f075a944240b65fab8a60887 100644 (file)
--- 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 cbffe92cc9a39542c3bf0b20b7fe9c3501546b07..7aed1ddfa148f8bf66f91d709ddf47bc8bdad84e 100644 (file)
--- 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 ab6270772aec26ad02883a232e8800c718954ee1..60f961a22bad7e69b4a92fd173ef2703bceb15e6 100644 (file)
--- 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 3d4f70c5ea0c2a3d2fe966cf4c24d10e89b69b18..8700d57a28286d32089f0f4ac434305944ba0bae 100644 (file)
--- 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)