Move the EModuleType into CModInfo

This also renames the values to shorter and more "well sounding" names.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2011-08-21 16:30:36 +02:00
parent 5f53c3509f
commit cce40e9f71
12 changed files with 76 additions and 76 deletions
+6 -6
View File
@@ -75,8 +75,8 @@ public:
}
virtual EModRet OnModuleLoading(const CString& sModName, const CString& sArgs,
EModuleType eType, bool& bSuccess, CString& sRetMsg) {
if (!GetUser() || eType != ModuleTypeUser) {
CModInfo::EModuleType eType, bool& bSuccess, CString& sRetMsg) {
if (!GetUser() || eType != CModInfo::UserModule) {
return CONTINUE;
}
EModRet result = HALT;
@@ -148,7 +148,7 @@ public:
case Perl_Loaded:
result = HALT;
if (4 == ret) {
ModInfo.AddType(ModuleTypeUser);
ModInfo.AddType(CModInfo::UserModule);
ModInfo.SetDescription(PString(ST(2)));
ModInfo.SetName(sModule);
ModInfo.SetPath(PString(ST(1)));
@@ -178,8 +178,8 @@ public:
return result;
}
virtual void OnGetAvailableMods(set<CModInfo>& ssMods, EModuleType eType) {
if (eType != ModuleTypeUser) {
virtual void OnGetAvailableMods(set<CModInfo>& ssMods, CModInfo::EModuleType eType) {
if (eType != CModInfo::UserModule) {
return;
}
@@ -203,7 +203,7 @@ public:
PUSH_STR(sName);
PCALL("ZNC::Core::ModInfoByPath");
if (!SvTRUE(ERRSV) && ret == 2) {
ModInfo.AddType(ModuleTypeUser);
ModInfo.AddType(CModInfo::UserModule);
ModInfo.SetDescription(PString(ST(0)));
ModInfo.SetName(sName);
ModInfo.SetPath(sPath);