diff --git a/Modules.cpp b/Modules.cpp index dc330c71..1a98f962 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -104,7 +104,6 @@ const CString& CTimer::GetDescription() const { return m_sDescription; } CModule::CModule(ModHandle pDLL, CUser* pUser, const CString& sModName, const CString& sDataDir) { - m_bFake = false; m_bGlobal = false; m_pDLL = pDLL; m_pManager = &(CZNC::Get().GetManager());; @@ -120,7 +119,6 @@ CModule::CModule(ModHandle pDLL, CUser* pUser, const CString& sModName, const CS } CModule::CModule(ModHandle pDLL, const CString& sModName, const CString& sDataDir) { - m_bFake = false; m_pDLL = pDLL; m_pManager = &(CZNC::Get().GetManager()); m_pUser = NULL; @@ -639,7 +637,7 @@ CModule* CModules::FindModule(const CString& sModule) const { return NULL; } -bool CModules::LoadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg, bool bFake) { +bool CModules::LoadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg) { sRetMsg = ""; if (FindModule(sModule) != NULL) { @@ -647,16 +645,6 @@ bool CModules::LoadModule(const CString& sModule, const CString& sArgs, CUser* p return false; } - if (bFake) { - CModule* pModule = new CModule(NULL, sModule, ""); - pModule->SetArgs(sArgs); - pModule->SetDescription("<>"); - pModule->SetFake(true); - push_back(pModule); - sRetMsg = "Loaded fake module [" + sModule + "]"; - return true; - } - CString sModPath, sDataPath; CString sDesc; bool bVersionMismatch; @@ -760,19 +748,6 @@ bool CModules::UnloadModule(const CString& sModule, CString& sRetMsg) { return false; } - if (pModule->IsFake()) { - for (iterator it = begin(); it != end(); ++it) { - if (*it == pModule) { - erase(it); - sRetMsg = "Fake module [" + sMod + "] unloaded"; - return true; - } - } - - sRetMsg = "Fake module [" + sMod + "] not loaded."; - return false; - } - ModHandle p = pModule->GetDLL(); if (p) { diff --git a/Modules.h b/Modules.h index 43c90235..2cde7c2c 100644 --- a/Modules.h +++ b/Modules.h @@ -751,7 +751,6 @@ public: const CString& GetSavePath() const { if (!CFile::Exists(m_sSavePath)) { CDir::MakeDir(m_sSavePath); } return m_sSavePath; } // Setters - void SetFake(bool b) { m_bFake = b; } void SetGlobal(bool b) { m_bGlobal = b; } void SetDescription(const CString& s) { m_sDescription = s; } void SetModPath(const CString& s) { m_sModPath = s; } @@ -759,7 +758,6 @@ public: // !Setters // Getters - bool IsFake() const { return m_bFake; } bool IsGlobal() const { return m_bGlobal; } const CString& GetDescription() const { return m_sDescription; } const CString& GetArgs() const { return m_sArgs; } @@ -779,7 +777,6 @@ public: // !Getters protected: - bool m_bFake; bool m_bGlobal; CString m_sDescription; set m_sTimers; @@ -876,7 +873,7 @@ public: bool OnTimerAutoJoin(CChan& Channel); CModule* FindModule(const CString& sModule) const; - bool LoadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg, bool bFake = false); + bool LoadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg); bool UnloadModule(const CString& sModule); bool UnloadModule(const CString& sModule, CString& sRetMsg); bool ReloadModule(const CString& sModule, const CString& sArgs, CUser* pUser, CString& sRetMsg);