From 7a16305594ab2c308db9aa615280197497ecd2b6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Feb 2013 19:03:12 +0000 Subject: PROTO_INTERFACE made zeroed on the basic inheritance level git-svn-id: http://svn.miranda-ng.org/main/trunk@3770 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_protoint.h | 4 +++- protocols/AimOscar/src/proto.h | 2 +- protocols/FacebookRM/src/proto.h | 2 +- protocols/Gadu-Gadu/src/gg_proto.h | 2 +- protocols/IRCG/src/irc.h | 2 +- protocols/IcqOscarJ/src/icq_proto.h | 2 +- protocols/JabberG/src/jabber_proto.h | 2 +- protocols/MRA/src/MraProto.h | 2 +- protocols/MSN/src/msn_proto.h | 2 +- protocols/Omegle/src/proto.h | 2 +- protocols/Skype/src/skype_proto.h | 2 +- protocols/Tlen/src/jabber.h | 2 +- protocols/Twitter/src/proto.h | 2 +- protocols/Yahoo/src/proto.h | 2 +- src/modules/protocols/protoint.cpp | 2 +- 15 files changed, 17 insertions(+), 15 deletions(-) diff --git a/include/m_protoint.h b/include/m_protoint.h index 554a08194e..471108ba55 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -24,6 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef M_PROTOINT_H__ #define M_PROTOINT_H__ 1 +#include + typedef enum { EV_PROTO_ONLOAD, @@ -41,7 +43,7 @@ typedef enum #define PROTOCHAR TCHAR #define PROTOFILEEVENT PROTORECVFILET -struct PROTO_INTERFACE +struct PROTO_INTERFACE : public MZeroedObject { int m_iStatus, m_iDesiredStatus, diff --git a/protocols/AimOscar/src/proto.h b/protocols/AimOscar/src/proto.h index b964c3ce17..f72938e6f3 100644 --- a/protocols/AimOscar/src/proto.h +++ b/protocols/AimOscar/src/proto.h @@ -27,7 +27,7 @@ typedef int ( __cdecl CAimProto::*AimEventFunc )( WPARAM, LPARAM ); typedef INT_PTR ( __cdecl CAimProto::*AimServiceFunc )( WPARAM, LPARAM ); typedef INT_PTR ( __cdecl CAimProto::*AimServiceFuncParam )( WPARAM, LPARAM, LPARAM ); -struct CAimProto : public PROTO_INTERFACE, public MZeroedObject +struct CAimProto : public PROTO_INTERFACE { CAimProto( const char*, const TCHAR* ); ~CAimProto(); diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h index d7dd494c95..878ad9aa39 100644 --- a/protocols/FacebookRM/src/proto.h +++ b/protocols/FacebookRM/src/proto.h @@ -22,7 +22,7 @@ along with this program. If not, see . #pragma once -class FacebookProto : public PROTO_INTERFACE, public MZeroedObject +class FacebookProto : public PROTO_INTERFACE { public: FacebookProto( const char *proto_name, const TCHAR *username ); diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h index e59f8424e5..6bb5a1565c 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.h +++ b/protocols/Gadu-Gadu/src/gg_proto.h @@ -27,7 +27,7 @@ typedef void ( __cdecl GGPROTO::*GGThreadFunc )( void* ); typedef int ( __cdecl GGPROTO::*GGEventFunc )( WPARAM, LPARAM ); typedef INT_PTR ( __cdecl GGPROTO::*GGServiceFunc )( WPARAM, LPARAM ); -struct GGPROTO : public PROTO_INTERFACE, public MZeroedObject +struct GGPROTO : public PROTO_INTERFACE { GGPROTO( const char*, const TCHAR* ); ~GGPROTO(); diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h index 82663a58bb..0fe14cb629 100644 --- a/protocols/IRCG/src/irc.h +++ b/protocols/IRCG/src/irc.h @@ -215,7 +215,7 @@ struct CIrcHandler PfnIrcMessageHandler m_handler; }; -struct CIrcProto : public PROTO_INTERFACE, public MZeroedObject +struct CIrcProto : public PROTO_INTERFACE { CIrcProto( const char*, const TCHAR* ); ~CIrcProto(); diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h index 11a880884f..fb35b0a227 100644 --- a/protocols/IcqOscarJ/src/icq_proto.h +++ b/protocols/IcqOscarJ/src/icq_proto.h @@ -51,7 +51,7 @@ struct userinfo time_t queued; }; -struct CIcqProto : public PROTO_INTERFACE, public MZeroedObject +struct CIcqProto : public PROTO_INTERFACE { CIcqProto( const char*, const TCHAR* ); ~CIcqProto(); diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 9f0a9f286a..09a037573c 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -145,7 +145,7 @@ struct CJabberInterface: public IJabberInterface CJabberProto *m_psProto; }; -struct CJabberProto : public PROTO_INTERFACE, public MZeroedObject +struct CJabberProto : public PROTO_INTERFACE { typedef PROTO_INTERFACE CSuper; diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h index 5576640571..e98a02f0fe 100644 --- a/protocols/MRA/src/MraProto.h +++ b/protocols/MRA/src/MraProto.h @@ -33,7 +33,7 @@ BOOL DB_SetStringExW(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, L int DB_WriteContactSettingBlob(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, LPVOID lpValue, size_t dwValueSize); BOOL DB_GetContactSettingBlob(HANDLE hContact, LPCSTR lpszModule, LPCSTR lpszValueName, LPVOID lpRet, size_t dwRetBuffSize, size_t *pdwRetBuffSize); -struct CMraProto : public PROTO_INTERFACE, public MZeroedObject +struct CMraProto : public PROTO_INTERFACE { CMraProto(const char*, const TCHAR*); ~CMraProto(); diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h index 1c0bd41fcf..e572663f0d 100644 --- a/protocols/MSN/src/msn_proto.h +++ b/protocols/MSN/src/msn_proto.h @@ -30,7 +30,7 @@ typedef int (__cdecl CMsnProto::*MsnEventFunc)(WPARAM, LPARAM); typedef INT_PTR (__cdecl CMsnProto::*MsnServiceFunc)(WPARAM, LPARAM); typedef INT_PTR (__cdecl CMsnProto::*MsnServiceFuncParam)(WPARAM, LPARAM, LPARAM); -struct CMsnProto : public PROTO_INTERFACE, public MZeroedObject +struct CMsnProto : public PROTO_INTERFACE { CMsnProto(const char*, const TCHAR*); ~CMsnProto(); diff --git a/protocols/Omegle/src/proto.h b/protocols/Omegle/src/proto.h index 3f1703c70b..001e148735 100644 --- a/protocols/Omegle/src/proto.h +++ b/protocols/Omegle/src/proto.h @@ -22,7 +22,7 @@ along with this program. If not, see . #pragma once -class OmegleProto : public PROTO_INTERFACE, public MZeroedObject +class OmegleProto : public PROTO_INTERFACE { public: OmegleProto( const char *proto_name, const TCHAR *username ); diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h index cdf9128912..5caf605240 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/protocols/Skype/src/skype_proto.h @@ -179,7 +179,7 @@ struct PasswordChangeBoxParam } }; -struct CSkypeProto : public PROTO_INTERFACE, public MZeroedObject +struct CSkypeProto : public PROTO_INTERFACE { public: CSkypeProto(const char *, const wchar_t *); diff --git a/protocols/Tlen/src/jabber.h b/protocols/Tlen/src/jabber.h index caade83f3a..954e3b4069 100644 --- a/protocols/Tlen/src/jabber.h +++ b/protocols/Tlen/src/jabber.h @@ -215,7 +215,7 @@ struct JABBER_LIST_ITEM_STRUCT; struct TLEN_VOICE_CONTROL_STRUCT; -struct TlenProtocol : public PROTO_INTERFACE, public MZeroedObject +struct TlenProtocol : public PROTO_INTERFACE { typedef PROTO_INTERFACE CSuper; diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h index a07e2f16ce..8a9525b91d 100644 --- a/protocols/Twitter/src/proto.h +++ b/protocols/Twitter/src/proto.h @@ -25,7 +25,7 @@ along with this program. If not, see . #include -class TwitterProto : public PROTO_INTERFACE, public MZeroedObject +class TwitterProto : public PROTO_INTERFACE { public: TwitterProto(const char *,const TCHAR *); diff --git a/protocols/Yahoo/src/proto.h b/protocols/Yahoo/src/proto.h index 9d70cbd9d5..0f472c4483 100644 --- a/protocols/Yahoo/src/proto.h +++ b/protocols/Yahoo/src/proto.h @@ -33,7 +33,7 @@ extern "C" typedef INT_PTR ( __cdecl CYahooProto::*YServiceFuncParam )( WPARAM, LPARAM, LPARAM ); #endif -struct CYahooProto : public PROTO_INTERFACE, public MZeroedObject +struct CYahooProto : public PROTO_INTERFACE { CYahooProto( const char*, const TCHAR* ); virtual ~CYahooProto(); diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp index 2d65a0e39c..1c80a97565 100644 --- a/src/modules/protocols/protoint.cpp +++ b/src/modules/protocols/protoint.cpp @@ -51,7 +51,7 @@ INT_PTR __fastcall MyCallProtoService(const char *szModule, const char *szServic return CallService(str, wParam, lParam); } -struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE, public MZeroedObject +struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE { HANDLE __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr) { -- cgit v1.2.3