From fc1d7ea89b5beed96022499fe7fa86bef7cf2aad Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 14 Feb 2013 20:58:01 -0500 Subject: Switch Destroy methods to delete --- modules/pseudoclients/chanserv.cpp | 4 ++-- modules/pseudoclients/nickserv.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/pseudoclients') diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp index 579c0b391..9832c622e 100644 --- a/modules/pseudoclients/chanserv.cpp +++ b/modules/pseudoclients/chanserv.cpp @@ -56,7 +56,7 @@ class ExpireCallback : public CallBack Log(LOG_NORMAL, "chanserv/expire") << "Expiring " << extra << "channel " << ci->name << " (founder: " << (ci->GetFounder() ? ci->GetFounder()->display : "(none)") << ")"; FOREACH_MOD(I_OnChanExpire, OnChanExpire(ci)); - ci->Destroy(); + delete ci; } } } @@ -142,7 +142,7 @@ class ChanServCore : public Module { Log(LOG_NORMAL, "chanserv/expire") << "Deleting channel " << ci->name << " owned by deleted nick " << nc->display; - ci->Destroy(); + delete ci; continue; } } diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 55f8b07cd..7b1ccd80c 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -177,7 +177,7 @@ class ExpireCallback : public CallBack extra = "suspended "; Log(LOG_NORMAL, "expire") << "Expiring " << extra << "nickname " << na->nick << " (group: " << na->nc->display << ") (e-mail: " << (na->nc->email.empty() ? "none" : na->nc->email) << ")"; FOREACH_MOD(I_OnNickExpire, OnNickExpire(na)); - na->Destroy(); + delete na; } } } -- cgit