From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - 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 --- plugins/TabSRMM/src/sendqueue.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'plugins/TabSRMM/src/sendqueue.cpp') diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp index a3a0764f30..30b9d6a183 100644 --- a/plugins/TabSRMM/src/sendqueue.cpp +++ b/plugins/TabSRMM/src/sendqueue.cpp @@ -127,7 +127,7 @@ entry_found: #define SPLIT_WORD_CUTOFF 20 -static int SendChunkW(WCHAR *chunk, HANDLE hContact, DWORD dwFlags) +static int SendChunkW(WCHAR *chunk, HCONTACT hContact, DWORD dwFlags) { int wLen = lstrlenW(chunk); DWORD memRequired = (wLen + 1) * sizeof(WCHAR); @@ -142,7 +142,7 @@ static int SendChunkW(WCHAR *chunk, HANDLE hContact, DWORD dwFlags) return CallContactService(hContact, PSS_MESSAGE, dwFlags, (LPARAM)pBuf); } -static int SendChunkA(char *chunk, HANDLE hContact, char *szSvc, DWORD dwFlags) +static int SendChunkA(char *chunk, HCONTACT hContact, char *szSvc, DWORD dwFlags) { return(CallContactService(hContact, szSvc, dwFlags, (LPARAM)chunk)); } @@ -150,13 +150,13 @@ static int SendChunkA(char *chunk, HANDLE hContact, char *szSvc, DWORD dwFlags) static void DoSplitSendW(LPVOID param) { SendJob *job = sendQueue->getJobByIndex((int)param); - BOOL fFirstSend = FALSE; + BOOL fFirstSend = FALSE; WCHAR *wszSaved, savedChar; - int iCur = 0, iSavedCur = 0, i; - BOOL fSplitting = TRUE; - HANDLE hContact = job->hOwner; - DWORD dwFlags = job->dwFlags; - int chunkSize = job->chunkSize / 2; + int iCur = 0, iSavedCur = 0, i; + BOOL fSplitting = TRUE; + HCONTACT hContact = job->hOwner; + DWORD dwFlags = job->dwFlags; + int chunkSize = job->chunkSize / 2; char *szProto = GetContactProto(hContact); int iLen = lstrlenA(job->szSendBuffer); @@ -224,14 +224,14 @@ static void DoSplitSendW(LPVOID param) static void DoSplitSendA(LPVOID param) { SendJob *job = sendQueue->getJobByIndex((int)param); - int id; - BOOL fFirstSend = FALSE; + int id; + BOOL fFirstSend = FALSE; char *szBegin, *szTemp, *szSaved, savedChar; - int iLen, iCur = 0, iSavedCur = 0, i; - BOOL fSplitting = TRUE; - HANDLE hContact = job->hOwner; - DWORD dwFlags = job->dwFlags; - int chunkSize = job->chunkSize; + int iLen, iCur = 0, iSavedCur = 0, i; + BOOL fSplitting = TRUE; + HCONTACT hContact = job->hOwner; + DWORD dwFlags = job->dwFlags; + int chunkSize = job->chunkSize; iLen = lstrlenA(job->szSendBuffer); szTemp = (char *)mir_alloc(iLen + 1); @@ -322,7 +322,7 @@ int SendQueue::sendQueued(TWindowData *dat, const int iEntry) int iSendLength = getSendLength(iEntry, dat->sendMode); - for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { + for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0); if (hItem && SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) { CContactCache *c = CContactCache::getContactCache(hContact); @@ -339,7 +339,7 @@ int SendQueue::sendQueued(TWindowData *dat, const int iEntry) return 0; } - for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { + for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0); if (hItem && SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) { doSendLater(iEntry, 0, hContact, false); @@ -804,7 +804,7 @@ LRESULT SendQueue::WarnPendingJobs(unsigned int uNrMessages) * * @return the index on success, -1 on failure */ -int SendQueue::doSendLater(int iJobIndex, TWindowData *dat, HANDLE hContact, bool fIsSendLater) +int SendQueue::doSendLater(int iJobIndex, TWindowData *dat, HCONTACT hContact, bool fIsSendLater) { bool fAvail = sendLater->isAvail(); -- cgit v1.2.3