Use CModule::ExpandString

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

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));
}
}