From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 20:47:51 +0000
Subject: HCONTACT is not needed anymore
git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/MirFox/src/MirandaOptions.cpp | 4 ++--
plugins/MirFox/src/MirandaUtils.cpp | 16 ++++++++--------
plugins/MirFox/src/MirandaUtils.h | 6 +++---
plugins/MirFox/src/MirfoxData.cpp | 8 ++++----
plugins/MirFox/src/MirfoxData.h | 8 ++++----
5 files changed, 21 insertions(+), 21 deletions(-)
(limited to 'plugins/MirFox/src')
diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp
index ec6f20e952..9492ab98a0 100644
--- a/plugins/MirFox/src/MirandaOptions.cpp
+++ b/plugins/MirFox/src/MirandaOptions.cpp
@@ -169,7 +169,7 @@ static void setListContactIcons(HWND hwndList){
boost::ptr_list<MirandaContact>::iterator mirandaContactsIter;
for (mirandaContactsIter = mirandaContactsPtr->begin(); mirandaContactsIter != mirandaContactsPtr->end(); mirandaContactsIter++){
- HCONTACT hContact = mirandaContactsIter->contactHandle;
+ MCONTACT hContact = mirandaContactsIter->contactHandle;
HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);
if(hItem) {
//if icon on 0th extracolumn is not set
@@ -484,7 +484,7 @@ INT_PTR CALLBACK DlgProcOpts_Tab2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
case PSN_APPLY:
{
- for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){
+ for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){
HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC2_CONTACTS_LIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
if(hItem) {
diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp
index f3491471c7..3681c30251 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((HCONTACT)args->targetHandle, mirandaSendModeFlag, msgBuffer);
+ HANDLE hProcess = sendMessageMiranda((MCONTACT)args->targetHandle, mirandaSendModeFlag, msgBuffer);
logger->log_p(L"SMTC: hProcess = [" SCNuPTR L"]", hProcess);
MIRFOXACKDATA* myMfAck = NULL;
@@ -213,7 +213,7 @@ void MirandaUtils::sendMessage(ActionThreadArgStruct* args, MFENUM_SEND_MESSAGE_
}
- MirandaContact* mirandaContact = args->mirfoxDataPtr->getMirandaContactPtrByHandle((HCONTACT)args->targetHandle);
+ MirandaContact* mirandaContact = args->mirfoxDataPtr->getMirandaContactPtrByHandle((MCONTACT)args->targetHandle);
const wchar_t* contactNameW = NULL;
TCHAR* tszAccountName = NULL;
if (mirandaContact){
@@ -226,7 +226,7 @@ void MirandaUtils::sendMessage(ActionThreadArgStruct* args, MFENUM_SEND_MESSAGE_
if(myMfAck != NULL && myMfAck->result == ACKRESULT_SUCCESS){
- addMessageToDB((HCONTACT)args->targetHandle, mirandaSendModeFlag, msgBuffer, bufSize, targetHandleSzProto);
+ addMessageToDB((MCONTACT)args->targetHandle, mirandaSendModeFlag, msgBuffer, bufSize, targetHandleSzProto);
if (mode == MFENUM_SMM_ONLY_SEND){
@@ -346,12 +346,12 @@ int MirandaUtils::getMirandaSendModeFlag(char* targetHandleSzProto)
}
-HANDLE MirandaUtils::sendMessageMiranda(HCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer)
+HANDLE MirandaUtils::sendMessageMiranda(MCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer)
{
return (HANDLE)CallContactService(hContact, PSS_MESSAGE, (WPARAM)mirandaSendModeFlag, (LPARAM)msgBuffer);
}
-void MirandaUtils::addMessageToDB(HCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer, std::size_t bufSize, char* targetHandleSzProto)
+void MirandaUtils::addMessageToDB(MCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer, std::size_t bufSize, char* targetHandleSzProto)
{
DBEVENTINFO dbei = {0};
dbei.cbSize = sizeof(dbei);
@@ -405,12 +405,12 @@ int MirandaUtils::on_hook_OpenMW(WPARAM wParam, LPARAM lParam)
MessageWindowData mwd;
mwd.cbSize = sizeof(MessageWindowData);
- mwd.hContact = (HCONTACT)param->targetHandle;
+ mwd.hContact = (MCONTACT)param->targetHandle;
mwd.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
MessageWindowInputData mwid;
mwid.cbSize = sizeof(MessageWindowInputData);
- mwid.hContact = (HCONTACT)param->targetHandle;
+ mwid.hContact = (MCONTACT)param->targetHandle;
mwid.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
delete param;
@@ -580,7 +580,7 @@ void MirandaUtils::translateOldDBNames() {
}
//contacts "state"
- for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){
+ for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){
logger->log_p(L"TranslateOldDBNames: found CONTACT: [" SCNuPTR L"]", hContact);
diff --git a/plugins/MirFox/src/MirandaUtils.h b/plugins/MirFox/src/MirandaUtils.h
index 2c6e04afcc..08d434a418 100644
--- a/plugins/MirFox/src/MirandaUtils.h
+++ b/plugins/MirFox/src/MirandaUtils.h
@@ -80,9 +80,9 @@ private:
int getMirandaSendModeFlag(char* targetHandleSzProto);
- HANDLE sendMessageMiranda(HCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer);
+ HANDLE sendMessageMiranda(MCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer);
- void addMessageToDB(HCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer, std::size_t bufSize, char* targetHandleSzProto);
+ void addMessageToDB(MCONTACT hContact, int mirandaSendModeFlag, char* msgBuffer, std::size_t bufSize, char* targetHandleSzProto);
void setStatusOnAccount(ActionThreadArgStruct* args);
@@ -100,7 +100,7 @@ private:
typedef struct {
const char* szModule;
- HCONTACT hContact;
+ MCONTACT hContact;
int result;
const char* errorDesc;
} MIRFOXACKDATA;
diff --git a/plugins/MirFox/src/MirfoxData.cpp b/plugins/MirFox/src/MirfoxData.cpp
index 0f82d638f8..9ed2657ee9 100644
--- a/plugins/MirFox/src/MirfoxData.cpp
+++ b/plugins/MirFox/src/MirfoxData.cpp
@@ -49,7 +49,7 @@ void MirfoxData::clearMirandaContacts(){
}
int
-MirfoxData::updateMirandaContactState(HCONTACT contactHandle, MFENUM_MIRANDACONTACT_STATE & contactState)
+MirfoxData::updateMirandaContactState(MCONTACT contactHandle, MFENUM_MIRANDACONTACT_STATE & contactState)
{
boost::ptr_list<MirandaContact>* mirandaContactsPtr = getMirandaContacts();
@@ -65,7 +65,7 @@ MirfoxData::updateMirandaContactState(HCONTACT contactHandle, MFENUM_MIRANDACONT
}
MirandaContact*
-MirfoxData::getMirandaContactPtrByHandle(HCONTACT contactHandle){
+MirfoxData::getMirandaContactPtrByHandle(MCONTACT contactHandle){
MFLogger* logger = MFLogger::getInstance();
@@ -355,7 +355,7 @@ void MirfoxData::initializeMirandaContacts()
//get contects from miranda
- for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){
+ for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)){
//add to list
MirandaContact* mirandaContactItemPtr = new MirandaContact(
hContact //handle to contact in miranda
@@ -574,7 +574,7 @@ MirandaAccount::getObjectPtr()
* class functions implementation
*/
-MirandaContact::MirandaContact(HCONTACT contactHandleL)
+MirandaContact::MirandaContact(MCONTACT contactHandleL)
{
contactState = MFENUM_MIRANDACONTACT_STATE_UNKNOWN;
contactHandle = contactHandleL;
diff --git a/plugins/MirFox/src/MirfoxData.h b/plugins/MirFox/src/MirfoxData.h
index 8fe5729107..746abb0d82 100644
--- a/plugins/MirFox/src/MirfoxData.h
+++ b/plugins/MirFox/src/MirfoxData.h
@@ -134,10 +134,10 @@ public:
//update MirandaContact's state by id
//return 0 - ok,
- int updateMirandaContactState(HCONTACT contactHandle, MFENUM_MIRANDACONTACT_STATE & contactState);
+ int updateMirandaContactState(MCONTACT contactHandle, MFENUM_MIRANDACONTACT_STATE & contactState);
//return MirandaContact* by HANDLE
- MirandaContact* getMirandaContactPtrByHandle(HCONTACT contactHandle);
+ MirandaContact* getMirandaContactPtrByHandle(MCONTACT contactHandle);
@@ -256,11 +256,11 @@ class MirandaContact
{
public:
- MirandaContact(HCONTACT contactHandleL);
+ MirandaContact(MCONTACT contactHandleL);
~MirandaContact(void);
MirandaContact* getObjectPtr();
- HCONTACT contactHandle; //HANDLE to contact in miranda (unikalne)
+ MCONTACT contactHandle; //HANDLE to contact in miranda (unikalne)
std::wstring contactNameW; //presented name
MFENUM_MIRANDACONTACT_STATE contactState; //state in options
MirandaAccount* mirandaAccountPtr; //account of hContact
--
cgit v1.2.3