adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add default types to modules

Browse Source
This commit is contained in:
Kyle Fuller
2011-08-27 17:04:02 +00:00
parent 98777a27af
commit d48ae679c4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ClientCommand.cpp
+3 -3
View File
@@ -786,7 +786,7 @@ void CClient::UserCommand(CString& sLine) {
}
if (sType.Equals("default")) {
eType = ModInfo.DefaultType();
eType = ModInfo.GetDefaultType();
}
if (eType == CModInfo::GlobalModule && !m_pUser->IsAdmin()) {
@@ -855,7 +855,7 @@ void CClient::UserCommand(CString& sLine) {
}
if (sType.Equals("default")) {
eType = ModInfo.DefaultType();
eType = ModInfo.GetDefaultType();
}
if (eType == CModInfo::GlobalModule && !m_pUser->IsAdmin()) {
@@ -924,7 +924,7 @@ void CClient::UserCommand(CString& sLine) {
}
if (sType.Equals("default")) {
eType = ModInfo.DefaultType();
eType = ModInfo.GetDefaultType();
}
if (eType == CModInfo::GlobalModule && !m_pUser->IsAdmin()) {
Modules.h
+4 -4
View File
@@ -63,6 +63,7 @@ template<class M> CModule* TModLoad(ModHandle p, CUser* pUser,
if (dCoreVersion != VERSION) \
return false; \
Info.SetDescription(DESCRIPTION); \
Info.SetDefaultType(TYPE); \
Info.AddType(TYPE); \
Info.SetLoader(TModLoad<CLASS>); \
TModInfo<CLASS>(Info); \
@@ -199,10 +200,6 @@ public:
m_seType.insert(eType);
}
EModuleType DefaultType() {
return *m_seType.begin();
}
static CString ModuleTypeToString(EModuleType eType) {
switch (eType) {
case GlobalModule: return "Global";
@@ -218,6 +215,7 @@ public:
const CString& GetDescription() const { return m_sDescription; }
const CString& GetWikiPage() const { return m_sWikiPage; }
ModLoader GetLoader() const { return m_fLoader; }
EModuleType GetDefaultType() const { return m_eDefaultType; }
// !Getters
// Setters
@@ -226,10 +224,12 @@ public:
void SetDescription(const CString& s) { m_sDescription = s; }
void SetWikiPage(const CString& s) { m_sWikiPage = s; }
void SetLoader(ModLoader fLoader) { m_fLoader = fLoader; }
void SetDefaultType(EModuleType eType) { m_eDefaultType = eType; }
// !Setters
private:
protected:
set<EModuleType> m_seType;
EModuleType m_eDefaultType;
CString m_sName;
CString m_sPath;
CString m_sDescription;