core protocol helpers for creating protocol evengs, services & threads

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

2 files changed, 3 insertions, 10 deletions

diff --git a/protocols/Tlen/src/jabber.h b/protocols/Tlen/src/jabber.h
index cb06e7e34e..7727eb799b 100644
--- a/protocols/Tlen/src/jabber.h
+++ b/protocols/Tlen/src/jabber.h
@@ -210,11 +210,8 @@ struct JABBER_IQ_FUNC_STRUCT;
 struct JABBER_LIST_ITEM_STRUCT;

 struct TLEN_VOICE_CONTROL_STRUCT;

 

-

-struct TlenProtocol : public PROTO_INTERFACE

+struct TlenProtocol : public PROTO<TlenProtocol>

 {

-	typedef PROTO_INTERFACE CSuper;

-

 	TlenProtocol( const char*, const TCHAR* );

 	~TlenProtocol();

 

diff --git a/protocols/Tlen/src/jabber_svc.cpp b/protocols/Tlen/src/jabber_svc.cpp
index 8214b33483..bade2c8869 100644
--- a/protocols/Tlen/src/jabber_svc.cpp
+++ b/protocols/Tlen/src/jabber_svc.cpp
@@ -1264,10 +1264,9 @@ void TlenInitServicesVTbl(TlenProtocol *proto) {
 

 }

 

-TlenProtocol::TlenProtocol( const char* aProtoName, const TCHAR* aUserName )

+TlenProtocol::TlenProtocol( const char *aProtoName, const TCHAR *aUserName) :

+	PROTO<TlenProtocol>(aProtoName, aUserName)

 {

-	ProtoConstructor(this, aProtoName, aUserName);

-

 	TlenInitServicesVTbl(this);

 

 	InitializeCriticalSection(&modeMsgMutex);

@@ -1304,7 +1303,6 @@ TlenProtocol::TlenProtocol( const char* aProtoName, const TCHAR* aUserName )
 	JabberSerialInit(this);

 	JabberIqInit(this);

 	JabberListInit(this);

-

 }

 

 TlenProtocol::~TlenProtocol()

@@ -1330,6 +1328,4 @@ TlenProtocol::~TlenProtocol()
 	mir_free(modeMsgs.szDnd);

 	mir_free(modeMsgs.szFreechat);

 	mir_free(modeMsgs.szInvisible);

-

-	ProtoDestructor(this);

 }