diff options
Diffstat (limited to 'plugins/Import/src')
-rw-r--r-- | plugins/Import/src/import.cpp | 2 | ||||
-rw-r--r-- | plugins/Import/src/main.cpp | 4 | ||||
-rw-r--r-- | plugins/Import/src/miranda.cpp | 4 | ||||
-rw-r--r-- | plugins/Import/src/utils.cpp | 12 | ||||
-rw-r--r-- | plugins/Import/src/wizard.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index e77334dde8..6d2d16215e 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -110,7 +110,7 @@ static HANDLE HistoryImportFindContact(HWND hdlgProgress, char* szModuleName, DW hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);
CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)szModuleName);
- DBWriteContactSettingDword(hContact, szModuleName, "UIN", uin);
+ db_set_dw(hContact, szModuleName, "UIN", uin);
AddMessage( LPGENT("Added contact %u (found in history)"), uin );
return hContact;
}
diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index e4ac431248..c5cb25aa7e 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -84,7 +84,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_IMPORT, static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
{
- if (DBGetContactSettingByte(NULL, IMPORT_MODULE, IMP_KEY_FR, 0))
+ if (db_get_b(NULL, IMPORT_MODULE, IMP_KEY_FR, 0))
return 0;
// Only autorun import wizard if at least one protocol is installed
@@ -93,7 +93,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) ProtoEnumAccounts(&nProtocols, &ppProtos);
if (nProtocols > 0) {
CallService(IMPORT_SERVICE, 0, 0);
- DBWriteContactSettingByte(NULL, IMPORT_MODULE, IMP_KEY_FR, 1);
+ db_set_b(NULL, IMPORT_MODULE, IMP_KEY_FR, 1);
}
return 0;
}
diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 71e149c0f4..fc9a654165 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -243,7 +243,7 @@ INT_PTR CALLBACK MirandaAdvOptionsPageProc(HWND hdlg,UINT message,WPARAM wParam, struct tm *TM = NULL;
struct _SYSTEMTIME ST = {0};
- dwSinceDate = DBGetContactSettingDword(NULL,IMPORT_MODULE,"ImportSinceTS",time(NULL));
+ dwSinceDate = db_get_dw(NULL,IMPORT_MODULE,"ImportSinceTS",time(NULL));
TM = localtime(&dwSinceDate);
@@ -306,7 +306,7 @@ INT_PTR CALLBACK MirandaAdvOptionsPageProc(HWND hdlg,UINT message,WPARAM wParam, dwSinceDate = mktime(&TM);
- DBWriteContactSettingDword(NULL,IMPORT_MODULE,"ImportSinceTS",dwSinceDate);
+ db_set_dw(NULL,IMPORT_MODULE,"ImportSinceTS",dwSinceDate);
} }
if (nCustomOptions)
diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp index 397f5df370..58bad9efc9 100644 --- a/plugins/Import/src/utils.cpp +++ b/plugins/Import/src/utils.cpp @@ -50,26 +50,26 @@ int CreateGroup(const TCHAR* group, HANDLE hContact) for (int groupId = 0; ; groupId++) {
DBVARIANT dbv;
itoa(groupId, groupIdStr,10);
- if (DBGetContactSettingTString(NULL, "CListGroups", groupIdStr, &dbv))
+ if (db_get_ts(NULL, "CListGroups", groupIdStr, &dbv))
break;
if ( !lstrcmp(dbv.ptszVal + 1, tszGrpName + 1 )) {
if (hContact)
- DBWriteContactSettingTString( hContact, "CList", "Group", tszGrpName+1 );
+ db_set_ts( hContact, "CList", "Group", tszGrpName+1 );
else
AddMessage( LPGENT("Skipping duplicate group %s."), tszGrpName + 1);
- DBFreeVariant(&dbv);
+ db_free(&dbv);
return 0;
}
- DBFreeVariant(&dbv);
+ db_free(&dbv);
}
- DBWriteContactSettingTString( NULL, "CListGroups", groupIdStr, tszGrpName );
+ db_set_ts( NULL, "CListGroups", groupIdStr, tszGrpName );
if (hContact)
- DBWriteContactSettingTString( hContact, "CList", "Group", tszGrpName+1 );
+ db_set_ts( hContact, "CList", "Group", tszGrpName+1 );
return 1;
}
diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp index 8a4b71faf3..71dc010786 100644 --- a/plugins/Import/src/wizard.cpp +++ b/plugins/Import/src/wizard.cpp @@ -78,7 +78,7 @@ INT_PTR CALLBACK FinishedPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM // prevent the plugin from disabling/enabling correctly (this fix relies
// on the plugin loader to ignore case)
CharLowerA(pszFileName);
- DBWriteContactSettingByte(NULL, "PluginDisable", pszFileName, 1);
+ db_set_b(NULL, "PluginDisable", pszFileName, 1);
}
PostMessage(GetParent(hdlg), WM_CLOSE, 0, 0);
break;
|