diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-10 08:04:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-10 08:04:30 +0000 |
| commit | ddba4ede6b451d0cfcd0d32b5180fbd0689966bf (patch) | |
| tree | 5d74f37a7013d13b92c182628d6b68a58e148ae4 /plugins/Import/src/import.cpp | |
| parent | c39340bf493a1745a41317bbf937fc7eb6cbb26a (diff) | |
- 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
Diffstat (limited to 'plugins/Import/src/import.cpp')
| -rw-r--r-- | plugins/Import/src/import.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index dbb6e5a02b..5a8b873fb9 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -65,8 +65,8 @@ static MCONTACT HContactFromNumericID(char *pszProtoName, char *pszSetting, DWOR {
MCONTACT hContact = dstDb->FindFirstContact();
while (hContact != NULL) {
- if ( db_get_dw((HANDLE)hContact, pszProtoName, pszSetting, 0) == dwID) {
- char* szProto = GetContactProto((HANDLE)hContact);
+ if ( db_get_dw((HCONTACT)hContact, pszProtoName, pszSetting, 0) == dwID) {
+ char* szProto = GetContactProto((HCONTACT)hContact);
if (szProto != NULL && !lstrcmpA(szProto, pszProtoName))
return hContact;
}
@@ -79,9 +79,9 @@ static MCONTACT HContactFromID(char *pszProtoName, char *pszSetting, TCHAR *pwsz {
MCONTACT hContact = dstDb->FindFirstContact();
while (hContact != NULL) {
- char* szProto = GetContactProto((HANDLE)hContact);
+ char* szProto = GetContactProto((HCONTACT)hContact);
if ( !lstrcmpA(szProto, pszProtoName)) {
- ptrW id(db_get_tsa((HANDLE)hContact, pszProtoName, pszSetting));
+ ptrW id(db_get_tsa((HCONTACT)hContact, pszProtoName, pszSetting));
if ( !lstrcmp(pwszID, id))
return hContact;
}
@@ -107,7 +107,7 @@ static MCONTACT HistoryImportFindContact(HWND hdlgProgress, char* szModuleName, hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)szModuleName);
- db_set_dw((HANDLE)hContact, szModuleName, "UIN", uin);
+ db_set_dw((HCONTACT)hContact, szModuleName, "UIN", uin);
AddMessage( LPGENT("Added contact %u (found in history)"), uin );
return hContact;
}
@@ -125,10 +125,10 @@ static MCONTACT AddContact(HWND hdlgProgress, char* szProto, char* pszUniqueSett mySet(hContact, szProto, pszUniqueSetting, id);
- CreateGroup(group, (HANDLE)hContact);
+ CreateGroup(group, (HCONTACT)hContact);
if (nick && *nick) {
- db_set_ws((HANDLE)hContact, "CList", "MyHandle", nick);
+ db_set_ws((HCONTACT)hContact, "CList", "MyHandle", nick);
AddMessage(LPGENT("Added %S contact %s, '%s'"), szProto, pszUserID, nick);
}
else AddMessage(LPGENT("Added %S contact %s"), szProto, pszUserID);
@@ -404,7 +404,7 @@ static void ImportHistory(MCONTACT hContact, PROTOACCOUNT **protocol, int protoC if (!skip) {
// Check for duplicate entries
- if (!IsDuplicateEvent((HANDLE)hDst, dbei)) {
+ if (!IsDuplicateEvent((HCONTACT)hDst, dbei)) {
// Add dbevent
if (!bIsVoidContact)
dbei.flags &= ~DBEF_FIRST;
|