- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

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

1 files changed, 7 insertions, 7 deletions

diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp
index c2374ab166..2fefc5b8ec 100644
--- a/plugins/MirFox/src/MirandaUtils.cpp
+++ b/plugins/MirFox/src/MirandaUtils.cpp
@@ -181,7 +181,7 @@ void MirandaUtils::sendMessage(ActionThreadArgStruct* args, MFENUM_SEND_MESSAGE_
 		}

 

 		logger->log_p(L"SMTC: mirandaSendModeFlag = [%d]  bufSize = [%d]", mirandaSendModeFlag, bufSize);

-		HANDLE hProcess = sendMessageMiranda(args->targetHandle, mirandaSendModeFlag, msgBuffer);

+		HANDLE hProcess = sendMessageMiranda((HCONTACT)args->targetHandle, mirandaSendModeFlag, msgBuffer);

 		logger->log_p(L"SMTC: hProcess = [" SCNuPTR L"]", hProcess);

 

 		MIRFOXACKDATA* myMfAck = NULL;

@@ -227,7 +227,7 @@ void MirandaUtils::sendMessage(ActionThreadArgStruct* args, MFENUM_SEND_MESSAGE_
 

 		if(myMfAck != NULL && myMfAck->result == ACKRESULT_SUCCESS){

 

-			addMessageToDB(args->targetHandle, mirandaSendModeFlag, msgBuffer, bufSize, targetHandleSzProto);

+			addMessageToDB((HCONTACT)args->targetHandle, mirandaSendModeFlag, msgBuffer, bufSize, targetHandleSzProto);

 

 			if (mode == MFENUM_SMM_ONLY_SEND){

 

@@ -347,12 +347,12 @@ int MirandaUtils::getMirandaSendModeFlag(char* targetHandleSzProto)
 

 }

 

-HANDLE MirandaUtils::sendMessageMiranda(HANDLE hContact, int mirandaSendModeFlag, char* msgBuffer)

+HANDLE MirandaUtils::sendMessageMiranda(HCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer)

 {

 	return (HANDLE)CallContactService(hContact, PSS_MESSAGE, (WPARAM)mirandaSendModeFlag, (LPARAM)msgBuffer);

 }

 

-void MirandaUtils::addMessageToDB(HANDLE hContact, int mirandaSendModeFlag, char* msgBuffer, std::size_t bufSize, char* targetHandleSzProto)

+void MirandaUtils::addMessageToDB(HCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer, std::size_t bufSize, char* targetHandleSzProto)

 {

 	DBEVENTINFO dbei = {0};

 	dbei.cbSize = sizeof(dbei);

@@ -406,12 +406,12 @@ int MirandaUtils::on_hook_OpenMW(WPARAM wParam, LPARAM lParam)
 

 	MessageWindowData mwd;

 	mwd.cbSize = sizeof(MessageWindowData);

-	mwd.hContact = param->targetHandle;

+	mwd.hContact = (HCONTACT)param->targetHandle;

 	mwd.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;

 

 	MessageWindowInputData mwid;

 	mwid.cbSize = sizeof(MessageWindowInputData);

-	mwid.hContact = param->targetHandle;

+	mwid.hContact = (HCONTACT)param->targetHandle;

 	mwid.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;

 

 	delete param;

@@ -581,7 +581,7 @@ void MirandaUtils::translateOldDBNames() {
 	}

 

 	//contacts		"state"

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){

 

 		logger->log_p(L"TranslateOldDBNames: found CONTACT: [" SCNuPTR L"]", hContact);