diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-27 20:50:07 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-27 20:50:07 +0000 |
| commit | 13c033c257f6c083b0c46b4fa28601db5a0b6335 (patch) | |
| tree | cb6c2d292df718d1cddd885ad1029a0b81f1b7e4 /plugins/UserInfoEx/src/ex_import | |
| parent | 367e673a5a3d4d49b2ef1bfbf57a1a5828a2d174 (diff) | |
MS_MC_GETMETACONTACT => db_mc_getMeta
git-svn-id: http://svn.miranda-ng.org/main/trunk@8317 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/src/ex_import')
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp | 8 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index 67681553b8..74cfe49000 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -242,7 +242,7 @@ MCONTACT CExImContactBase::toDB() return _hContact = INVALID_CONTACT_ID;
}
// Add the protocol to the new contact
- if (CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)_hContact, (LPARAM)_pszProto)) {
+ if (CallService(MS_PROTO_ADDTOCONTACT, _hContact, (LPARAM)_pszProto)) {
DB::Contact::Delete(_hContact);
return _hContact = INVALID_CONTACT_ID;
}
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index de9db38883..a71efbfa07 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -511,7 +511,7 @@ int CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact) if (vSub = xSub) {
// identify metacontact by the first valid subcontact in xmlfile
if (_hContact == INVALID_CONTACT_ID && vSub.handle() != INVALID_CONTACT_ID) {
- MCONTACT hMeta = (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)vSub.handle(), NULL);
+ MCONTACT hMeta = db_mc_getMeta(vSub.handle());
if (hMeta != NULL) {
_hContact = hMeta;
break;
@@ -636,7 +636,7 @@ int CExImContactXML::ImportNormalContact() int err = ImportContact();
// remove contact from a metacontact
- if (err == ERROR_OK && CallService(MS_MC_GETMETACONTACT, (WPARAM)_hContact, NULL))
+ if (err == ERROR_OK && db_mc_getMeta(_hContact))
CallService(MS_MC_REMOVEFROMMETA, NULL, (LPARAM)_hContact);
return err;
@@ -736,9 +736,9 @@ int CExImContactXML::ImportMetaSubContact(CExImContactXML * pMetaContact) return err;
// check if contact is subcontact of the desired meta contact
- if ((MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)_hContact, NULL) != pMetaContact->handle()) {
+ if (db_mc_getMeta(_hContact) != pMetaContact->handle()) {
// add contact to the metacontact (this service returns TRUE if successful)
- err = CallService(MS_MC_ADDTOMETA, (WPARAM)_hContact, (LPARAM)pMetaContact->handle());
+ err = CallService(MS_MC_ADDTOMETA, _hContact, (LPARAM)pMetaContact->handle());
if (err == FALSE) {
// ask to delete new contact
if (_isNewContact && _hContact != NULL) {
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp index 6a5f9154dc..ed8c032472 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp @@ -158,7 +158,7 @@ int CFileXml::Export(lpExImParam ExImContact, LPCSTR pszFileName) case EXIM_ALL:
case EXIM_GROUP:
// dont export meta subcontacts by default
- if (!DB::MetaContact::IsSub(hContact)) {
+ if (!db_mc_isSub(hContact)) {
if (vContact.fromDB(hContact)) {
vContact.Export(xmlfile, &Modules);
}
@@ -167,7 +167,7 @@ int CFileXml::Export(lpExImParam ExImContact, LPCSTR pszFileName) case EXIM_SUBGROUP:
// dont export meta subcontacts by default and
// export only contact with selectet group name
- if (!DB::MetaContact::IsSub(hContact) &&
+ if (!db_mc_isSub(hContact) &&
mir_tcsncmp(ExImContact->ptszName, DB::Setting::GetTString(hContact, "CList", "Group"), mir_tcslen(ExImContact->ptszName))== 0)
{
if (vContact.fromDB(hContact)) {
|