iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-07 22:04:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use CModule::ExpandString

Browse Source
This commit is contained in:
Alexey Sokolov
2013-01-20 10:33:24 +07:00
parent 42cb0d7de7
commit f661f2a002
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/autoreply.cpp
+1 -5
View File
@@ -39,11 +39,7 @@ public:
SetReply(sReply);
}
if (m_pNetwork) {
return m_pNetwork->ExpandString(sReply);
}
return m_pUser->ExpandString(sReply);
return ExpandString(sReply);
}
void Handle(const CString& sNick) {
modules/identfile.cpp
+3 -3
View File
@@ -48,12 +48,12 @@ public:
void SetFormat(const CString& sLine) {
SetNV("Format", sLine.Token(1, true));
PutModule("Format has been set to: " + GetNV("Format"));
PutModule("Format would be expanded to: " + m_pUser->ExpandString(GetNV("Format")));
PutModule("Format would be expanded to: " + ExpandString(GetNV("Format")));
}
void GetFormat(const CString& sLine) {
PutModule("Format is set to: " + GetNV("Format"));
PutModule("Format would be expanded to: " + m_pUser->ExpandString(GetNV("Format")));
PutModule("Format would be expanded to: " + ExpandString(GetNV("Format")));
}
void Show(const CString& sLine) {
@@ -109,7 +109,7 @@ public:
return false;
}
CString sData = m_pNetwork->ExpandString(GetNV("Format"));
CString sData = ExpandString(GetNV("Format"));
// If the format doesn't contain anything expandable, we'll
// assume this is an "old"-style format string.
modules/perform.cpp
+2 -7
View File
@@ -40,7 +40,6 @@ class CPerform : public CModule {
void List(const CString& sCommand) {
CTable Table;
unsigned int index = 1;
CString sExpanded;
Table.AddColumn("Id");
Table.AddColumn("Perform");
@@ -51,11 +50,7 @@ class CPerform : public CModule {
Table.SetCell("Id", CString(index));
Table.SetCell("Perform", *it);
if (m_pNetwork) {
sExpanded = m_pNetwork->ExpandString(*it);
} else {
sExpanded = GetUser()->ExpandString(*it);
}
CString sExpanded = ExpandString(*it);
if (sExpanded != *it) {
Table.SetCell("Expanded", sExpanded);
@@ -128,7 +123,7 @@ public:
virtual void OnIRCConnected() {
for (VCString::const_iterator it = m_vPerform.begin(); it != m_vPerform.end(); ++it) {
PutIRC(m_pNetwork->ExpandString(*it));
PutIRC(ExpandString(*it));
}
}