more HCONTACT

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

4 files changed, 11 insertions, 11 deletions

diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp
index 9a37a50284..3cb24db577 100644
--- a/protocols/Twitter/src/contacts.cpp
+++ b/protocols/Twitter/src/contacts.cpp
@@ -43,7 +43,7 @@ void TwitterProto::AddToListWorker(void *p)
 	mir_free(name);

 }

 

-HANDLE TwitterProto::AddToList(int flags,PROTOSEARCHRESULT *result)

+HCONTACT TwitterProto::AddToList(int flags,PROTOSEARCHRESULT *result)

 {

 	if(m_iStatus != ID_STATUS_ONLINE)

 		return 0;

@@ -87,7 +87,7 @@ int TwitterProto::GetInfo(HCONTACT hContact,int info_type)
 

 	if(info_type == 0) // From clicking "Update" in the Userinfo dialog

 	{

-		ForkThread(&TwitterProto::UpdateInfoWorker, hContact);

+		ForkThread(&TwitterProto::UpdateInfoWorker, (void*)hContact);

 		return 0;

 	}

 

@@ -179,7 +179,7 @@ void TwitterProto::GetAwayMsgWorker(void *hContact)
 

 HANDLE TwitterProto::GetAwayMsg(HCONTACT hContact)

 {

-	ForkThread(&TwitterProto::GetAwayMsgWorker, hContact);

+	ForkThread(&TwitterProto::GetAwayMsgWorker, (void*)hContact);

 	return (HANDLE)1;

 }

 

@@ -188,7 +188,7 @@ int TwitterProto::OnContactDeleted(WPARAM wParam,LPARAM lParam)
 	if(m_iStatus != ID_STATUS_ONLINE)

 		return 0;

 

-	const HCONTACT hContact = reinterpret_cast<HCONTACT>(wParam);

+	const HCONTACT hContact = (HCONTACT)wParam;

 

 	if(!IsMyContact(hContact))

 		return 0;

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 33b7a019ea..6ec565871f 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -246,7 +246,7 @@ INT_PTR TwitterProto::GetStatus(WPARAM,LPARAM)
 INT_PTR TwitterProto::ReplyToTweet(WPARAM wParam,LPARAM)

 {

 	// TODO: support replying to tweets instead of just users

-	HCONTACT hContact = reinterpret_cast<HCONTACT>(wParam);

+	HCONTACT hContact = (HCONTACT)wParam;

 

 	HWND hDlg = CreateDialogParam(g_hInstance,MAKEINTRESOURCE(IDD_TWEET),0,tweet_proc,reinterpret_cast<LPARAM>(this));

 

@@ -264,7 +264,7 @@ INT_PTR TwitterProto::ReplyToTweet(WPARAM wParam,LPARAM)
 

 INT_PTR TwitterProto::VisitHomepage(WPARAM wParam,LPARAM)

 {

-	HCONTACT hContact = reinterpret_cast<HCONTACT>(wParam);

+	HCONTACT hContact = (HCONTACT)wParam;

 

 	DBVARIANT dbv;

 	// TODO: remove this

@@ -398,7 +398,7 @@ int TwitterProto::OnPreShutdown(WPARAM,LPARAM)
 

 int TwitterProto::OnPrebuildContactMenu(WPARAM wParam,LPARAM)

 {

-	HCONTACT hContact = reinterpret_cast<HCONTACT>(wParam);

+	HCONTACT hContact = (HCONTACT)wParam;

 	if(IsMyContact(hContact))

 		ShowContactMenus(true);

 

@@ -498,7 +498,7 @@ void TwitterProto::UpdateSettings()
 		for(HCONTACT hContact = db_find_first(m_szModuleName); hContact; ) {

 			HCONTACT hNext = db_find_next(hContact, m_szModuleName);

 			if(isChatRoom(hContact))

-				CallService(MS_DB_CONTACT_DELETE,reinterpret_cast<WPARAM>(hContact),0);

+				CallService(MS_DB_CONTACT_DELETE, WPARAM(hContact), 0);

 			hContact = hNext;

 		}

 	}

diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h
index 16739bbfc9..68a7cb3b27 100644
--- a/protocols/Twitter/src/proto.h
+++ b/protocols/Twitter/src/proto.h
@@ -36,8 +36,8 @@ public:
 

 	//PROTO_INTERFACE

 

-	virtual	HANDLE    __cdecl AddToList(int,PROTOSEARCHRESULT *);

-	virtual	HANDLE    __cdecl AddToListByEvent(int,int,HANDLE);

+	virtual	HCONTACT  __cdecl AddToList(int,PROTOSEARCHRESULT *);

+	virtual	HCONTACT  __cdecl AddToListByEvent(int,int,HANDLE);

 

 	virtual	int       __cdecl Authorize(HANDLE);

 	virtual	int       __cdecl AuthDeny(HANDLE,const TCHAR *);

diff --git a/protocols/Twitter/src/stubs.cpp b/protocols/Twitter/src/stubs.cpp
index c62ae86147..9b8fc7deea 100644
--- a/protocols/Twitter/src/stubs.cpp
+++ b/protocols/Twitter/src/stubs.cpp
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "proto.h"

 

-HANDLE TwitterProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent)

+HCONTACT TwitterProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent)

 {

 	return NULL;

 }