chats: more functions, less structures

git-svn-id: http://svn.miranda-ng.org/main/trunk@17309 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 162 insertions, 164 deletions

diff --git a/protocols/IRCG/src/stdafx.h b/protocols/IRCG/src/stdafx.h
index e3190007ca..e28616db4e 100644
--- a/protocols/IRCG/src/stdafx.h
+++ b/protocols/IRCG/src/stdafx.h
@@ -97,23 +97,26 @@ struct CIrcProto;
 // special service for tweaking performance, implemented in chat.dll

 #define MS_GC_GETEVENTPTR  "GChat/GetNewEventPtr"

 typedef int (*GETEVENTFUNC)(WPARAM wParam, LPARAM lParam);

-typedef struct  {

+typedef struct

+{

 	GETEVENTFUNC pfnAddEvent;

 }

-	GCPTRS;

+GCPTRS;

 

 #define IP_AUTO       1

 #define IP_MANUAL     2

 

 struct IPRESOLVE      // Contains info about the channels

 {

-	IPRESOLVE( const char* _addr, int _type ) :

-		sAddr( _addr ),

-		iType( _type )

-	{}

+	IPRESOLVE(const char* _addr, int _type) :

+		sAddr(_addr),

+		iType(_type)

+	{

+	}

 

 	~IPRESOLVE()

-	{}

+	{

+	}

 

 	CMStringA     sAddr;

 	int        iType;

@@ -144,13 +147,15 @@ struct SERVER_INFO  // Contains info about different servers
 

 struct PERFORM_INFO  // Contains 'm_perform buffer' for different networks

 {

-	PERFORM_INFO( const char* szSetting, const wchar_t* value ) :

-		mSetting( szSetting ),

-		mText( value )

-	{}

+	PERFORM_INFO(const char* szSetting, const wchar_t* value) :

+		mSetting(szSetting),

+		mText(value)

+	{

+	}

 

 	~PERFORM_INFO()

-	{}

+	{

+	}

 

 	CMStringA mSetting;

 	CMStringW mText;

@@ -186,14 +191,15 @@ using namespace irc;
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-typedef bool (CIrcProto::*PfnIrcMessageHandler)(const CIrcMessage* pmsg);

+typedef bool (CIrcProto::*PfnIrcMessageHandler)(const CIrcMessage *pmsg);

 

 struct CIrcHandler

 {

-	CIrcHandler( const wchar_t* _name, PfnIrcMessageHandler _handler ) :

-		m_name( _name ),

-		m_handler( _handler )

-	{}

+	CIrcHandler(const wchar_t* _name, PfnIrcMessageHandler _handler) :

+		m_name(_name),

+		m_handler(_handler)

+	{

+	}

 

 	const wchar_t* m_name;

 	PfnIrcMessageHandler m_handler;

@@ -201,22 +207,22 @@ struct CIrcHandler
 

 struct CIrcProto : public PROTO<CIrcProto>

 {

-				CIrcProto(const char*, const wchar_t*);

-			   ~CIrcProto();

+	CIrcProto(const char*, const wchar_t*);

+	~CIrcProto();

 

-				// Protocol interface

+	// Protocol interface

 

-	virtual	MCONTACT  __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

+	virtual	MCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

 

 	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

 	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const wchar_t* szReason);

 

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const wchar_t *szPath);

-	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer );

+	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t *szReason);

-	virtual	int       __cdecl FileResume( HANDLE hTransfer, int *action, const wchar_t **szFilename);

+	virtual	int       __cdecl FileResume(HANDLE hTransfer, int *action, const wchar_t **szFilename);

 

-	virtual	DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL);

+	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

 

 	virtual	HANDLE    __cdecl SearchBasic(const wchar_t* id);

 

@@ -240,10 +246,10 @@ struct CIrcProto : public PROTO<CIrcProto>
 	INT_PTR __cdecl OnJoinMenuCommand(WPARAM, LPARAM);

 	INT_PTR __cdecl OnLeaveChat(WPARAM, LPARAM);

 	INT_PTR __cdecl OnMenuChanSettings(WPARAM, LPARAM);

-	INT_PTR __cdecl OnMenuDisconnect( WPARAM , LPARAM );

+	INT_PTR __cdecl OnMenuDisconnect(WPARAM, LPARAM);

 	INT_PTR __cdecl OnMenuIgnore(WPARAM, LPARAM);

 	INT_PTR __cdecl OnMenuWhois(WPARAM, LPARAM);

-	INT_PTR __cdecl OnQuickConnectMenuCommand(WPARAM, LPARAM );

+	INT_PTR __cdecl OnQuickConnectMenuCommand(WPARAM, LPARAM);

 	INT_PTR __cdecl OnShowListMenuCommand(WPARAM, LPARAM);

 	INT_PTR __cdecl OnShowServerMenuCommand(WPARAM, LPARAM);

 

@@ -262,25 +268,25 @@ struct CIrcProto : public PROTO<CIrcProto>
 	// Data

 

 	char     m_serverName[100];

-	char     m_password [500];

-	wchar_t    m_identSystem[10];

+	char     m_password[500];

+	wchar_t  m_identSystem[10];

 	char     m_network[30];

 	char     m_portStart[10];

 	char     m_portEnd[10];

 	int      m_iSSL;

-	wchar_t    m_identPort[10];

-	wchar_t    m_nick[30], m_pNick[30];

-	wchar_t    m_alternativeNick[30];

-	wchar_t    m_name[200];

-	wchar_t    m_userID[200];

-	wchar_t    m_quitMessage[400];

-	wchar_t    m_userInfo[500];

+	wchar_t  m_identPort[10];

+	wchar_t  m_nick[30], m_pNick[30];

+	wchar_t  m_alternativeNick[30];

+	wchar_t  m_name[200];

+	wchar_t  m_userID[200];

+	wchar_t  m_quitMessage[400];

+	wchar_t  m_userInfo[500];

 	char     m_myHost[50];

 	char     m_mySpecifiedHost[500];

 	char     m_mySpecifiedHostIP[50];

 	char     m_myLocalHost[50];

 	WORD     m_myLocalPort;

-	wchar_t*   m_alias;

+	wchar_t *m_alias;

 	int      m_serverComboSelection;

 	int      m_quickComboSelection;

 	int      m_onlineNotificationTime;

@@ -345,28 +351,26 @@ struct CIrcProto : public PROTO<CIrcProto>
 

 	bool     bPerformDone;

 

-	CJoinDlg*    m_joinDlg;

-	CListDlg*    m_listDlg;

-	CManagerDlg* m_managerDlg;

-	CNickDlg*    m_nickDlg;

-	CWhoisDlg*   m_whoisDlg;

-	CQuickDlg*   m_quickDlg;

-	CIgnorePrefsDlg* m_ignoreDlg;

+	CJoinDlg *m_joinDlg;

+	CListDlg *m_listDlg;

+	CNickDlg *m_nickDlg;

+	CWhoisDlg *m_whoisDlg;

+	CQuickDlg *m_quickDlg;

+	CManagerDlg *m_managerDlg;

+	CIgnorePrefsDlg *m_ignoreDlg;

 

 	int      m_noOfChannels, m_manualWhoisCount;

 	CMStringA   sChannelModes, sUserModes;

 	CMStringW sChannelPrefixes, sUserModePrefixes, WhoisAwayReply;

 

-	//clist.cpp

+	// clist.cpp

 	MCONTACT CList_AddContact(CONTACT *user, bool InList, bool SetOnline);

 	bool     CList_SetAllOffline(BYTE ChatsToo);

 	MCONTACT CList_SetOffline(CONTACT *user);

-

-	bool     CList_AddEvent(CONTACT *user, HICON Icon, HANDLE event, const char *tooltip, int type );

 	MCONTACT CList_FindContact(CONTACT *user);

 	BOOL     CList_AddDCCChat(const CMStringW &name, const CMStringW &hostmask, unsigned long adr, int port);

 

-	//commandmonitor.cpp

+	// commandmonitor.cpp

 	UINT_PTR IdentTimer, InitTimer, KeepAliveTimer, OnlineNotifTimer, OnlineNotifTimer3;

 

 	int  AddOutgoingMessageToDB(MCONTACT hContact, wchar_t *msg);

@@ -374,18 +378,18 @@ struct CIrcProto : public PROTO<CIrcProto>
 	int  DoPerform(const char *event);

 	void __cdecl ResolveIPThread(void *di);

 

-	bool AddIgnore(const wchar_t *mask, const wchar_t *mode, const wchar_t *network) ;

+	bool AddIgnore(const wchar_t *mask, const wchar_t *mode, const wchar_t *network);

 	int  IsIgnored(const CMStringW &nick, const CMStringW &address, const CMStringW &host, char type);

 	int  IsIgnored(CMStringW user, char type);

-	bool RemoveIgnore(const wchar_t *mask) ;

+	bool RemoveIgnore(const wchar_t *mask);

 

-	//input.cpp

-	CMStringW DoAlias( const wchar_t *text, wchar_t *window);

-	BOOL     DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hContact);

+	// input.cpp

+	CMStringW DoAlias(const wchar_t *text, wchar_t *window);

+	BOOL      DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hContact);

 	CMStringW DoIdentifiers(CMStringW text, const wchar_t *window);

-	void     FormatMsg(CMStringW &text);

-	bool     PostIrcMessageWnd(wchar_t *pszWindow, MCONTACT hContact, const wchar_t *szBuf);

-	bool     PostIrcMessage(const wchar_t *fmt, ...);

+	void      FormatMsg(CMStringW &text);

+	bool      PostIrcMessageWnd(wchar_t *pszWindow, MCONTACT hContact, const wchar_t *szBuf);

+	bool      PostIrcMessage(const wchar_t *fmt, ...);

 

 	// irclib.cpp

 	UINT_PTR	DCCTimer;

@@ -404,12 +408,12 @@ struct CIrcProto : public PROTO<CIrcProto>
 

 	OBJLIST<CIrcIgnoreItem> m_ignoreItems;

 

-	int      m_channelNumber;

+	int       m_channelNumber;

 	CMStringW m_whoReply;

 	CMStringW sNamesList;

 	CMStringW sTopic;

 	CMStringW sTopicName;

-	CMStringW	sTopicTime;

+	CMStringW sTopicTime;

 	CMStringW m_namesToWho;

 	CMStringW m_channelsToWho;

 	CMStringW m_namesToUserhost;

@@ -417,18 +421,18 @@ struct CIrcProto : public PROTO<CIrcProto>
 	void    InitPrefs(void);

 	void    InitIgnore(void);

 

-	void    ReadSettings( TDbSetting* sets, int count );

-	void    RewriteIgnoreSettings( void );

-	void    WriteSettings( TDbSetting* sets, int count );

+	void    ReadSettings(TDbSetting* sets, int count);

+	void    RewriteIgnoreSettings(void);

+	void    WriteSettings(TDbSetting* sets, int count);

 

-	//output

-	BOOL   ShowMessage (const CIrcMessage* pmsg);

+	// output

+	BOOL   ShowMessage(const CIrcMessage *pmsg);

 

-	//scripting.cpp

-	INT_PTR  __cdecl Scripting_InsertRawIn(WPARAM wParam,LPARAM lParam);

-	INT_PTR  __cdecl Scripting_InsertRawOut(WPARAM wParam,LPARAM lParam);

-	INT_PTR  __cdecl Scripting_InsertGuiIn(WPARAM wParam,LPARAM lParam);

-	INT_PTR  __cdecl Scripting_InsertGuiOut(WPARAM wParam,LPARAM lParam);

+	// scripting.cpp

+	INT_PTR  __cdecl Scripting_InsertRawIn(WPARAM wParam, LPARAM lParam);

+	INT_PTR  __cdecl Scripting_InsertRawOut(WPARAM wParam, LPARAM lParam);

+	INT_PTR  __cdecl Scripting_InsertGuiIn(WPARAM wParam, LPARAM lParam);

+	INT_PTR  __cdecl Scripting_InsertGuiOut(WPARAM wParam, LPARAM lParam);

 	INT_PTR  __cdecl Scripting_GetIrcData(WPARAM wparam, LPARAM lparam);

 

 	// services.cpp

@@ -436,59 +440,55 @@ struct CIrcProto : public PROTO<CIrcProto>
 	void   DisconnectFromServer(void);

 	void   InitMainMenus(void);

 

-	void __cdecl ConnectServerThread( void* );

-	void __cdecl DisconnectServerThread( void* );

-

-	//tools.cpp

-	void     AddToJTemp(wchar_t op, CMStringW& sCommand);

-	bool     AddWindowItemData(CMStringW window, const wchar_t* pszLimit, const wchar_t* pszMode, const wchar_t* pszPassword, const wchar_t* pszTopic);

-	INT_PTR  CallChatEvent(WPARAM wParam, GCEVENT *);

-	INT_PTR  DoEvent(int iEvent, const wchar_t* pszWindow, const wchar_t* pszNick, const wchar_t* pszText, const wchar_t* pszStatus, const wchar_t* pszUserInfo, DWORD_PTR dwItemData, bool bAddToLog, bool bIsMe,time_t timestamp = 1);

-	void     FindLocalIP(HANDLE con);

-	bool     FreeWindowItemData(CMStringW window, CHANNELINFO* wis);

-	bool     IsChannel(const char* sName);

-	bool     IsChannel(const wchar_t* sName);

-	void     KillChatTimer(UINT_PTR &nIDEvent);

+	void __cdecl ConnectServerThread(void*);

+	void __cdecl DisconnectServerThread(void*);

+

+	// tools.cpp

+	void      AddToJTemp(wchar_t op, CMStringW& sCommand);

+	bool      AddWindowItemData(CMStringW window, const wchar_t *pszLimit, const wchar_t *pszMode, const wchar_t *pszPassword, const wchar_t *pszTopic);

+	INT_PTR   DoEvent(int iEvent, const wchar_t *pszWindow, const wchar_t *pszNick, const wchar_t *pszText, const wchar_t *pszStatus, const wchar_t *pszUserInfo, DWORD_PTR dwItemData, bool bAddToLog, bool bIsMe, time_t timestamp = 1);

+	void      FindLocalIP(HANDLE con);

+	bool      FreeWindowItemData(CMStringW window, CHANNELINFO* wis);

+	bool      IsChannel(const char* sName);

+	bool      IsChannel(const wchar_t* sName);

+	void      KillChatTimer(UINT_PTR &nIDEvent);

 	CMStringW MakeWndID(const wchar_t* sWindow);

 	CMStringW ModeToStatus(int sMode);

 	CMStringW PrefixToStatus(int cPrefix);

-	int      SetChannelSBText(CMStringW sWindow, CHANNELINFO * wi);

-	void     SetChatTimer(UINT_PTR &nIDEvent,UINT uElapse, TIMERPROC lpTimerFunc);

+	int       SetChannelSBText(CMStringW sWindow, CHANNELINFO *wi);

+	void      SetChatTimer(UINT_PTR &nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc);

 

-	void     ClearUserhostReasons(int type);

-	void     DoUserhostWithReason(int type, CMStringW reason, bool bSendCommand, CMStringW userhostparams, ...);

+	void      ClearUserhostReasons(int type);

+	void      DoUserhostWithReason(int type, CMStringW reason, bool bSendCommand, CMStringW userhostparams, ...);

 	CMStringW GetNextUserhostReason(int type);

 	CMStringW PeekAtReasons(int type);

 

-	// userinfo.cpp

-	void __cdecl AckUserInfoSearch( void* hContact );

-

 	////////////////////////////////////////////////////////////////////////////////////////

 	// former CIrcSession class

 

-	void AddDCCSession(MCONTACT hContact, CDccSession* dcc);

-	void AddDCCSession(DCCINFO*  pdci, CDccSession* dcc);

+	void AddDCCSession(MCONTACT hContact, CDccSession *dcc);

+	void AddDCCSession(DCCINFO *pdci, CDccSession *dcc);

 	void RemoveDCCSession(MCONTACT hContact);

-	void RemoveDCCSession(DCCINFO*  pdci);

+	void RemoveDCCSession(DCCINFO *pdci);

 

 	CDccSession* FindDCCSession(MCONTACT hContact);

-	CDccSession* FindDCCSession(DCCINFO* pdci);

+	CDccSession* FindDCCSession(DCCINFO *pdci);

 	CDccSession* FindDCCSendByPort(int iPort);

-	CDccSession* FindDCCRecvByPortAndName(int iPort, const wchar_t* szName);

+	CDccSession* FindDCCRecvByPortAndName(int iPort, const wchar_t *szName);

 	CDccSession* FindPassiveDCCSend(int iToken);

 	CDccSession* FindPassiveDCCRecv(CMStringW sName, CMStringW sToken);

 

 	void DisconnectAllDCCSessions(bool Shutdown);

 	void CheckDCCTimeout(void);

 

-	bool Connect(const CIrcSessionInfo& info);

+	bool Connect(const CIrcSessionInfo &info);

 	void Disconnect(void);

 	void KillIdent(void);

 

 	int NLSend(const wchar_t* fmt, ...);

 	int NLSend(const char* fmt, ...);

 	int NLSend(const unsigned char* buf, int cbBuf);

-	int NLSendNoScript( const unsigned char* buf, int cbBuf);

+	int NLSendNoScript(const unsigned char* buf, int cbBuf);

 	int NLReceive(unsigned char* buf, int cbBuf);

 	void InsertIncomingEvent(wchar_t* pszRaw);

 

@@ -496,11 +496,11 @@ struct CIrcProto : public PROTO<CIrcProto>
 

 	// send-to-stream operators

 	int getCodepage() const;

-	__inline void setCodepage( int aPage ) { codepage = aPage; }

+	__inline void setCodepage(int aPage) { codepage = aPage; }

 

 	CIrcSessionInfo m_info;

 

-protected :

+protected:

 	int codepage;

 	HANDLE con;

 	HANDLE hBindPort;

@@ -508,74 +508,74 @@ protected :
 	LIST<CDccSession> m_dcc_chats;

 	LIST<CDccSession> m_dcc_xfers;

 

-private :

+private:

 	mir_cs m_dcc; // protect the dcc objects

 

-	void createMessageFromPchar( const char* p );

-	void Notify(const CIrcMessage* pmsg);

-	void __cdecl ThreadProc( void *pparam );

+	void createMessageFromPchar(const char* p);

+	void Notify(const CIrcMessage *pmsg);

+	void __cdecl ThreadProc(void *pparam);

 

 	////////////////////////////////////////////////////////////////////////////////////////

 	// former CIrcMonitor class

 

-	bool OnIrc_PING(const CIrcMessage* pmsg);

-	bool OnIrc_WELCOME(const CIrcMessage* pmsg);

-	bool OnIrc_YOURHOST(const CIrcMessage* pmsg);

-	bool OnIrc_NICK(const CIrcMessage* pmsg);

-	bool OnIrc_PRIVMSG(const CIrcMessage* pmsg);

-	bool OnIrc_JOIN(const CIrcMessage* pmsg);

-	bool OnIrc_QUIT(const CIrcMessage* pmsg);

-	bool OnIrc_PART(const CIrcMessage* pmsg);

-	bool OnIrc_KICK(const CIrcMessage* pmsg);

-	bool OnIrc_MODE(const CIrcMessage* pmsg);

-	bool OnIrc_USERHOST_REPLY(const CIrcMessage* pmsg);

-	bool OnIrc_MODEQUERY(const CIrcMessage* pmsg);

-	bool OnIrc_NAMES(const CIrcMessage* pmsg);

-	bool OnIrc_ENDNAMES(const CIrcMessage* pmsg);

-	bool OnIrc_INITIALTOPIC(const CIrcMessage* pmsg);

-	bool OnIrc_INITIALTOPICNAME(const CIrcMessage* pmsg);

-	bool OnIrc_TOPIC(const CIrcMessage* pmsg);

-	bool OnIrc_TRYAGAIN(const CIrcMessage* pmsg);

-	bool OnIrc_NOTICE(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_NAME(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_CHANNELS(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_SERVER(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_AWAY(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_IDLE(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_END(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_OTHER(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_AUTH(const CIrcMessage* pmsg);

-	bool OnIrc_WHOIS_NO_USER(const CIrcMessage* pmsg);

-	bool OnIrc_NICK_ERR(const CIrcMessage* pmsg);

-	bool OnIrc_ENDMOTD(const CIrcMessage* pmsg);

-	bool OnIrc_LISTSTART(const CIrcMessage* pmsg);

-	bool OnIrc_LIST(const CIrcMessage* pmsg);

-	bool OnIrc_LISTEND(const CIrcMessage* pmsg);

-	bool OnIrc_BANLIST(const CIrcMessage* pmsg);

-	bool OnIrc_BANLISTEND(const CIrcMessage* pmsg);

-	bool OnIrc_SUPPORT(const CIrcMessage* pmsg);

-	bool OnIrc_BACKFROMAWAY(const CIrcMessage* pmsg);

-	bool OnIrc_SETAWAY(const CIrcMessage* pmsg);

-	bool OnIrc_JOINERROR(const CIrcMessage* pmsg);

-	bool OnIrc_UNKNOWN(const CIrcMessage* pmsg);

-	bool OnIrc_ERROR(const CIrcMessage* pmsg);

-	bool OnIrc_NOOFCHANNELS(const CIrcMessage* pmsg);

-	bool OnIrc_PINGPONG(const CIrcMessage* pmsg);

-	bool OnIrc_INVITE(const CIrcMessage* pmsg);

-	bool OnIrc_WHO_END(const CIrcMessage* pmsg);

-	bool OnIrc_WHO_REPLY(const CIrcMessage* pmsg);

-	bool OnIrc_WHOTOOLONG(const CIrcMessage* pmsg);

-

-	bool IsCTCP(const CIrcMessage* pmsg);

-

-	void OnIrcDefault(const CIrcMessage* pmsg);

+	bool OnIrc_PING(const CIrcMessage *pmsg);

+	bool OnIrc_WELCOME(const CIrcMessage *pmsg);

+	bool OnIrc_YOURHOST(const CIrcMessage *pmsg);

+	bool OnIrc_NICK(const CIrcMessage *pmsg);

+	bool OnIrc_PRIVMSG(const CIrcMessage *pmsg);

+	bool OnIrc_JOIN(const CIrcMessage *pmsg);

+	bool OnIrc_QUIT(const CIrcMessage *pmsg);

+	bool OnIrc_PART(const CIrcMessage *pmsg);

+	bool OnIrc_KICK(const CIrcMessage *pmsg);

+	bool OnIrc_MODE(const CIrcMessage *pmsg);

+	bool OnIrc_USERHOST_REPLY(const CIrcMessage *pmsg);

+	bool OnIrc_MODEQUERY(const CIrcMessage *pmsg);

+	bool OnIrc_NAMES(const CIrcMessage *pmsg);

+	bool OnIrc_ENDNAMES(const CIrcMessage *pmsg);

+	bool OnIrc_INITIALTOPIC(const CIrcMessage *pmsg);

+	bool OnIrc_INITIALTOPICNAME(const CIrcMessage *pmsg);

+	bool OnIrc_TOPIC(const CIrcMessage *pmsg);

+	bool OnIrc_TRYAGAIN(const CIrcMessage *pmsg);

+	bool OnIrc_NOTICE(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_NAME(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_CHANNELS(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_SERVER(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_AWAY(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_IDLE(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_END(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_OTHER(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_AUTH(const CIrcMessage *pmsg);

+	bool OnIrc_WHOIS_NO_USER(const CIrcMessage *pmsg);

+	bool OnIrc_NICK_ERR(const CIrcMessage *pmsg);

+	bool OnIrc_ENDMOTD(const CIrcMessage *pmsg);

+	bool OnIrc_LISTSTART(const CIrcMessage *pmsg);

+	bool OnIrc_LIST(const CIrcMessage *pmsg);

+	bool OnIrc_LISTEND(const CIrcMessage *pmsg);

+	bool OnIrc_BANLIST(const CIrcMessage *pmsg);

+	bool OnIrc_BANLISTEND(const CIrcMessage *pmsg);

+	bool OnIrc_SUPPORT(const CIrcMessage *pmsg);

+	bool OnIrc_BACKFROMAWAY(const CIrcMessage *pmsg);

+	bool OnIrc_SETAWAY(const CIrcMessage *pmsg);

+	bool OnIrc_JOINERROR(const CIrcMessage *pmsg);

+	bool OnIrc_UNKNOWN(const CIrcMessage *pmsg);

+	bool OnIrc_ERROR(const CIrcMessage *pmsg);

+	bool OnIrc_NOOFCHANNELS(const CIrcMessage *pmsg);

+	bool OnIrc_PINGPONG(const CIrcMessage *pmsg);

+	bool OnIrc_INVITE(const CIrcMessage *pmsg);

+	bool OnIrc_WHO_END(const CIrcMessage *pmsg);

+	bool OnIrc_WHO_REPLY(const CIrcMessage *pmsg);

+	bool OnIrc_WHOTOOLONG(const CIrcMessage *pmsg);

+

+	bool IsCTCP(const CIrcMessage *pmsg);

+

+	void OnIrcDefault(const CIrcMessage *pmsg);

 	void OnIrcDisconnected();

 

 	static OBJLIST<CIrcHandler> m_handlers;

 

 	PfnIrcMessageHandler FindMethod(const wchar_t* lpszName);

 

-	void OnIrcMessage(const CIrcMessage* pmsg);

+	void OnIrcMessage(const CIrcMessage *pmsg);

 	CMStringW sNick4Perform;

 };

 

@@ -594,16 +594,14 @@ extern LIST<CIrcProto> g_Instances;
 

 extern OBJLIST<SERVER_INFO> g_servers;

 

-void   UpgradeCheck(void);

-

-CIrcProto* GetTimerOwner( UINT_PTR eventId );

+CIrcProto* GetTimerOwner(UINT_PTR eventId);

 

-VOID CALLBACK IdentTimerProc( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime );

-VOID CALLBACK TimerProc( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime );

-VOID CALLBACK KeepAliveTimerProc( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime );

-VOID CALLBACK OnlineNotifTimerProc( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime );

-VOID CALLBACK OnlineNotifTimerProc3( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime );

-VOID CALLBACK DCCTimerProc( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime );

+VOID CALLBACK IdentTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

+VOID CALLBACK TimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

+VOID CALLBACK KeepAliveTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

+VOID CALLBACK OnlineNotifTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

+VOID CALLBACK OnlineNotifTimerProc3(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

+VOID CALLBACK DCCTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

 

 // options.cpp

 

@@ -622,9 +620,9 @@ int          __stdcall WCCmp(const wchar_t* wild, const wchar_t* string);
 char*        __stdcall IrcLoadFile(wchar_t * szPath);

 CMStringW     __stdcall GetWord(const wchar_t* text, int index);

 const wchar_t* __stdcall GetWordAddress(const wchar_t* text, int index);

-void         __stdcall RemoveLinebreaks( CMStringW& Message );

-wchar_t*       __stdcall my_strstri(const wchar_t *s1, const wchar_t *s2) ;

-wchar_t*       __stdcall DoColorCodes (const wchar_t* text, bool bStrip, bool bReplacePercent);

+void         __stdcall RemoveLinebreaks(CMStringW& Message);

+wchar_t*       __stdcall my_strstri(const wchar_t *s1, const wchar_t *s2);

+wchar_t*       __stdcall DoColorCodes(const wchar_t* text, bool bStrip, bool bReplacePercent);

 

 CMStringA   __stdcall GetWord(const char* text, int index);