From 55a3fa0e05304134bc2f55a2bffa50b84b024bb4 Mon Sep 17 00:00:00 2001 From: psychon Date: Thu, 3 Jan 2008 21:00:25 +0000 Subject: [PATCH] Remove OnFinishedConfig() module call No one used it anyway git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@909 726aef4b-f618-498e-8847-2d620e286838 --- Modules.cpp | 5 ----- Modules.h | 2 -- modules/partyline.cpp | 7 +++---- znc.cpp | 4 ---- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Modules.cpp b/Modules.cpp index f67cf565..026fafbb 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -547,7 +547,6 @@ bool CModule::PutModNotice(const CString& sLine, const CString& sIdent, const CS // CGlobalModule // /////////////////// CModule::EModRet CGlobalModule::OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan) { return CONTINUE; } -void CGlobalModule::OnFinishedConfig() {} CModule::EModRet CGlobalModule::OnDeleteUser(CUser& User) { return CONTINUE; } CModule::EModRet CGlobalModule::OnLoginAttempt(CSmartPtr Auth) { return CONTINUE; } void CGlobalModule::OnFailedLogin(const CString& sUsername, const CString& sRemoteIP) {} @@ -634,10 +633,6 @@ bool CGlobalModules::OnConfigLine(const CString& sName, const CString& sValue, C GLOBALMODHALTCHK(OnConfigLine(sName, sValue, pUser, pChan)); } -void CGlobalModules::OnFinishedConfig() { - GLOBALMODCALL(OnFinishedConfig()); -} - bool CGlobalModules::OnDeleteUser(CUser& User) { GLOBALMODHALTCHK(OnDeleteUser(User)); } diff --git a/Modules.h b/Modules.h index 2db40a8f..8aae0583 100644 --- a/Modules.h +++ b/Modules.h @@ -427,7 +427,6 @@ public: virtual ~CGlobalModule() {} virtual EModRet OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan); - virtual void OnFinishedConfig(); virtual EModRet OnDeleteUser(CUser& User); virtual EModRet OnLoginAttempt(CSmartPtr Auth); virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP); @@ -440,7 +439,6 @@ public: virtual ~CGlobalModules() {} virtual bool OnConfigLine(const CString& sName, const CString& sValue, CUser* pUser, CChan* pChan); - virtual void OnFinishedConfig(); virtual bool OnDeleteUser(CUser& User); virtual bool OnLoginAttempt(CSmartPtr Auth); virtual void OnFailedLogin(const CString& sUsername, const CString& sRemoteIP); diff --git a/modules/partyline.cpp b/modules/partyline.cpp index 3def6c42..94db750d 100644 --- a/modules/partyline.cpp +++ b/modules/partyline.cpp @@ -54,6 +54,9 @@ public: } virtual bool OnBoot() { + // The config is now read completely, so all Users are set up + Load(); + return true; } @@ -83,10 +86,6 @@ public: return true; } - void OnFinishedConfig() { - Load(); - } - void Load() { VCString vsChannels; for (MCString::iterator it = BeginNV(); it != EndNV(); it++) { diff --git a/znc.cpp b/znc.cpp index 192ba5d4..872f6319 100644 --- a/znc.cpp +++ b/znc.cpp @@ -1222,10 +1222,6 @@ bool CZNC::ParseConfig(const CString& sConfig) { return false; } -#ifdef _MODULES - GetModules().OnFinishedConfig(); -#endif - return true; }