From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - rest of menus cleared; - old database macroses wiped out from all plugins (left in m_database.h for compatibility) git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FileAsMessage/src/dialog.cpp | 24 ++++++++++++------------ plugins/FileAsMessage/src/optionsdlg.cpp | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/FileAsMessage') diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index 6d5069ab5f..466525ce88 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -264,18 +264,18 @@ int RetrieveFileSize(char *filename) FILEECHO::FILEECHO(HANDLE Contact) { hContact = Contact; - dwSendInterval = DBGetContactSettingDword(NULL, SERVICE_NAME, "SendDelay", 6000); - //dwChunkSize = DBGetContactSettingDword(NULL, SERVICE_NAME, "ChunkSize", 5000); + dwSendInterval = db_get_dw(NULL, SERVICE_NAME, "SendDelay", 6000); + //dwChunkSize = db_get_dw(NULL, SERVICE_NAME, "ChunkSize", 5000); - chunkMaxLen = DBGetContactSettingDword(NULL, SERVICE_NAME, "ChunkSize", 5000); + chunkMaxLen = db_get_dw(NULL, SERVICE_NAME, "ChunkSize", 5000); chunkCount = 0; filename = NULL; - rgbRecv = DBGetContactSettingDword(NULL, SERVICE_NAME, "colorRecv", RGB(64,255,64)); - rgbSent = DBGetContactSettingDword(NULL, SERVICE_NAME, "colorSent", RGB(255,255,64)); - rgbUnSent = DBGetContactSettingDword(NULL, SERVICE_NAME, "colorUnsent", RGB(128,128,128)); - rgbToSend = DBGetContactSettingDword(NULL, SERVICE_NAME, "colorTosend", RGB(192,192,192)); - asBinary = DBGetContactSettingDword(NULL, SERVICE_NAME, "base64", 1) == 0; + rgbRecv = db_get_dw(NULL, SERVICE_NAME, "colorRecv", RGB(64,255,64)); + rgbSent = db_get_dw(NULL, SERVICE_NAME, "colorSent", RGB(255,255,64)); + rgbUnSent = db_get_dw(NULL, SERVICE_NAME, "colorUnsent", RGB(128,128,128)); + rgbToSend = db_get_dw(NULL, SERVICE_NAME, "colorTosend", RGB(192,192,192)); + asBinary = db_get_dw(NULL, SERVICE_NAME, "base64", 1) == 0; } uint controlEnabled[][2] = @@ -573,8 +573,8 @@ void FILEECHO::incomeRequest(char *param) inSend = FALSE; SkinPlaySound("RecvFile"); - int AutoMin = DBGetContactSettingByte(NULL,"SRFile","AutoMin",0); - if(DBGetContactSettingByte(NULL,"SRFile","AutoAccept",0) && !DBGetContactSettingByte((HANDLE)hContact,"CList","NotOnList",0)) + int AutoMin = db_get_b(NULL,"SRFile","AutoMin",0); + if(db_get_b(NULL,"SRFile","AutoAccept",0) && !db_get_b((HANDLE)hContact,"CList","NotOnList",0)) { PostMessage(hDlg, WM_COMMAND, IDC_PLAY, 0); if(AutoMin) @@ -667,7 +667,7 @@ void FILEECHO::onRecvTimer() SetDlgItemText(hDlg, IDC_STATUS, msg); MakePopupMsg(hDlg, hContact, msg); setState(STATE_FINISHED); - if(DBGetContactSettingByte(NULL,"SRFile","AutoClose",0)) + if(db_get_b(NULL,"SRFile","AutoClose",0)) { PostMessage(hDlg, WM_CLOSE, 0,0); CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, 0); @@ -1184,7 +1184,7 @@ INT_PTR CALLBACK DialogProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam if (szProto) { int dwStatus; - dwStatus = DBGetContactSettingWord(dat->hContact,szProto,"Status",ID_STATUS_OFFLINE); + dwStatus = db_get_w(dat->hContact,szProto,"Status",ID_STATUS_OFFLINE); if(dat->inSend && dwStatus != dat->contactStatus) { if(dat->contactStatus == ID_STATUS_OFFLINE) diff --git a/plugins/FileAsMessage/src/optionsdlg.cpp b/plugins/FileAsMessage/src/optionsdlg.cpp index 748a118db5..d1b402c5c8 100644 --- a/plugins/FileAsMessage/src/optionsdlg.cpp +++ b/plugins/FileAsMessage/src/optionsdlg.cpp @@ -45,11 +45,11 @@ INT_PTR CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM for(int indx = 0; indx < SIZEOF(settingId); indx++) if(settingId[indx] > 0) - SendDlgItemMessage(hwndDlg, settingId[indx], CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, SERVICE_NAME, settingName[indx], settingDefault[indx])); + SendDlgItemMessage(hwndDlg, settingId[indx], CPM_SETCOLOUR, 0, db_get_dw(NULL, SERVICE_NAME, settingName[indx], settingDefault[indx])); else - SetDlgItemInt(hwndDlg, -settingId[indx], DBGetContactSettingDword(NULL, SERVICE_NAME, settingName[indx], settingDefault[indx]), FALSE); + SetDlgItemInt(hwndDlg, -settingId[indx], db_get_dw(NULL, SERVICE_NAME, settingName[indx], settingDefault[indx]), FALSE); - CheckDlgButton(hwndDlg, IDC_ALPHANUM, DBGetContactSettingDword(NULL, SERVICE_NAME, "base64", 1)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ALPHANUM, db_get_dw(NULL, SERVICE_NAME, "base64", 1)?BST_CHECKED:BST_UNCHECKED); return TRUE; @@ -97,9 +97,9 @@ INT_PTR CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM value = GetDlgItemInt(hwndDlg, -settingId[indx], &succ, FALSE); if(!succ) value = settingDefault[indx]; } - DBWriteContactSettingDword(NULL,SERVICE_NAME,settingName[indx], value); + db_set_dw(NULL,SERVICE_NAME,settingName[indx], value); } - DBWriteContactSettingDword(NULL,SERVICE_NAME, "base64", (IsDlgButtonChecked(hwndDlg, IDC_ALPHANUM) == BST_CHECKED)?1:0); + db_set_dw(NULL,SERVICE_NAME, "base64", (IsDlgButtonChecked(hwndDlg, IDC_ALPHANUM) == BST_CHECKED)?1:0); return TRUE; } -- cgit v1.2.3