From f31621b305f306570f9e36408ac3bc078b59d8f2 Mon Sep 17 00:00:00 2001 From: psychon Date: Mon, 7 Jun 2010 12:38:24 +0000 Subject: [PATCH] Remove some unneeded functions from CWebSock git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2014 726aef4b-f618-498e-8847-2d620e286838 --- WebModules.cpp | 15 ++++----------- WebModules.h | 1 - 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/WebModules.cpp b/WebModules.cpp index 9886b3d8..029404a5 100644 --- a/WebModules.cpp +++ b/WebModules.cpp @@ -120,13 +120,6 @@ CWebSock::CWebSock() : CHTTPSock(NULL) { m_Template.AddTagHandler(new CZNCTagHandler(*this)); } -CWebSock::CWebSock(const CString& sHostname, unsigned short uPort, int iTimeout) - : CHTTPSock(NULL, sHostname, uPort, iTimeout) { - m_bPathsSet = false; - - m_Template.AddTagHandler(new CZNCTagHandler(*this)); -} - CWebSock::~CWebSock() { if (!m_spAuth.IsNull()) { m_spAuth->Invalidate(); @@ -737,10 +730,10 @@ bool CWebSock::OnLogin(const CString& sUser, const CString& sPass) { } Csock* CWebSock::GetSockObj(const CString& sHost, unsigned short uPort) { - CWebSock* pSock = new CWebSock(sHost, uPort, 120); - pSock->SetSockName("Web::Client"); - - return pSock; + // All listening is done by CListener, thus CWebSock should never have + // to listen, but since GetSockObj() is pure virtual... + DEBUG("CWebSock::GetSockObj() called - this should never happen!"); + return NULL; } CString CWebSock::GetSkinName() { diff --git a/WebModules.h b/WebModules.h index 7380fbfb..0c8fc5a8 100644 --- a/WebModules.h +++ b/WebModules.h @@ -118,7 +118,6 @@ public: }; CWebSock(); - CWebSock(const CString& sHostname, unsigned short uPort, int iTimeout = 60); virtual ~CWebSock(); virtual bool ForceLogin();