diff options
| -rw-r--r-- | include/users.h | 13 | ||||
| -rw-r--r-- | src/users.cpp | 21 |
2 files changed, 1 insertions, 33 deletions
diff --git a/include/users.h b/include/users.h index 8cbf8a8da..b97c62d4a 100644 --- a/include/users.h +++ b/include/users.h @@ -663,14 +663,6 @@ class CoreExport User : public Extensible */ void ForEachNeighbor(ForEachNeighborHandler& handler, bool include_self = true); - /** Write to the user, routing the line if the user is remote. - */ - virtual void SendText(const std::string& line) = 0; - - /** Write to the user, routing the line if the user is remote. - */ - void SendText(const char* text, ...) CUSTOM_PRINTF(2, 3); - /** Return true if the user shares at least one channel with another user * @param other The other user to compare the channel list against * @return True if the given user shares at least one channel with this user @@ -842,7 +834,6 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local void SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline = true); - void SendText(const std::string& line); void Write(const std::string& text); void Write(const char*, ...) CUSTOM_PRINTF(2, 3); @@ -880,13 +871,12 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local bool HasModePermission(unsigned char mode, ModeType type); }; -class CoreExport RemoteUser : public User +class RemoteUser : public User { public: RemoteUser(const std::string& uid, Server* srv) : User(uid, srv, USERTYPE_REMOTE) { } - virtual void SendText(const std::string& line); }; class CoreExport FakeUser : public User @@ -904,7 +894,6 @@ class CoreExport FakeUser : public User } virtual CullResult cull(); - virtual void SendText(const std::string& line); virtual const std::string& GetFullHost(); virtual const std::string& GetFullRealHost(); }; diff --git a/src/users.cpp b/src/users.cpp index 7437e8a20..afc8f6f11 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -927,27 +927,6 @@ void User::ForEachNeighbor(ForEachNeighborHandler& handler, bool include_self) } } -void LocalUser::SendText(const std::string& line) -{ - Write(line); -} - -void RemoteUser::SendText(const std::string& line) -{ - ServerInstance->PI->PushToClient(this, line); -} - -void FakeUser::SendText(const std::string& line) -{ -} - -void User::SendText(const char *text, ...) -{ - std::string line; - VAFORMAT(line, text, text); - SendText(line); -} - void User::WriteRemoteNumeric(const Numeric::Numeric& numeric) { WriteNumeric(numeric); |