1 files changed, 2 insertions, 43 deletions

diff --git a/include/modules.h b/include/modules.h
index 5a4090dfb..41dec1194 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -206,34 +206,6 @@ class CoreExport Version
 	virtual ~Version() {}
 };
 
-/** The Event class is a unicast message directed at all modules.
- * When the class is properly instantiated it may be sent to all modules
- * using the Send() method, which will trigger the OnEvent method in
- * all modules passing the object as its parameter.
- */
-class CoreExport Event : public classbase
-{
- public:
-	/** This is a pointer to the sender of the message, which can be used to
-	 * directly trigger events, or to create a reply.
-	 */
-	ModuleRef source;
-	/** The event identifier.
-	 * This is arbitary text which should be used to distinguish
-	 * one type of event from another.
-	 */
-	const std::string id;
-
-	/** Create a new Event
-	 */
-	Event(Module* src, const std::string &eventid);
-	/** Send the Event.
-	 * The return result of an Event::Send() will always be NULL as
-	 * no replies are expected.
-	 */
-	void Send();
-};
-
 class CoreExport DataProvider : public ServiceProvider
 {
  public:
@@ -249,7 +221,6 @@ enum Priority { PRIORITY_FIRST, PRIORITY_LAST, PRIORITY_BEFORE, PRIORITY_AFTER }
  */
 enum Implementation
 {
-	I_BEGIN,
 	I_OnUserConnect, I_OnUserQuit, I_OnUserDisconnect, I_OnUserJoin, I_OnUserPart,
 	I_OnSendSnotice, I_OnUserPreJoin, I_OnUserPreKick, I_OnUserKick, I_OnOper, I_OnInfo, I_OnWhois,
 	I_OnUserPreInvite, I_OnUserInvite, I_OnUserPreMessage, I_OnUserPreNick,
@@ -260,7 +231,7 @@ enum Implementation
 	I_OnUnloadModule, I_OnBackgroundTimer, I_OnPreCommand, I_OnCheckReady, I_OnCheckInvite,
 	I_OnRawMode, I_OnCheckKey, I_OnCheckLimit, I_OnCheckBan, I_OnCheckChannelBan, I_OnExtBanCheck,
 	I_OnStats, I_OnChangeLocalUserHost, I_OnPreTopicChange,
-	I_OnPostTopicChange, I_OnEvent, I_OnPostConnect,
+	I_OnPostTopicChange, I_OnPostConnect,
 	I_OnChangeLocalUserGECOS, I_OnUserRegister, I_OnChannelPreDelete, I_OnChannelDelete,
 	I_OnPostOper, I_OnSyncNetwork, I_OnSetAway, I_OnPostCommand, I_OnPostJoin,
 	I_OnWhoisLine, I_OnBuildNeighborList, I_OnGarbageCollect, I_OnSetConnectClass,
@@ -952,12 +923,6 @@ class CoreExport Module : public classbase, public usecountbase
 	 */
 	virtual void OnPostTopicChange(User* user, Channel* chan, const std::string &topic);
 
-	/** Called whenever an Event class is sent to all modules by another module.
-	 * You should *always* check the value of Event::id to determine the event type.
-	 * @param event The Event class being received
-	 */
-	virtual void OnEvent(Event& event);
-
 	/** Called whenever a password check is to be made. Replaces the old OldOperCompare API.
 	 * The password field (from the config file) is in 'password' and is to be compared against
 	 * 'input'. This method allows for encryption of passwords (oper, connect:allow, die/restart, etc).
@@ -1151,12 +1116,6 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
 	 */
 	bool SetPriority(Module* mod, Implementation i, Priority s, Module* which = NULL);
 
-	/** Backwards compat interface */
-	inline bool SetPriority(Module* mod, Implementation i, Priority s, Module** dptr)
-	{
-		return SetPriority(mod, i, s, *dptr);
-	}
-
 	/** Change the priority of all events in a module.
 	 * @param mod The module to set the priority of
 	 * @param s The priority of all events in the module.
@@ -1165,7 +1124,7 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
 	 * SetPriority method for this, where you may specify other modules to
 	 * be prioritized against.
 	 */
-	bool SetPriority(Module* mod, Priority s);
+	void SetPriority(Module* mod, Priority s);
 
 	/** Attach an event to a module.
 	 * You may later detatch the event with ModuleManager::Detach().