From 769b537b5e1a99fc53aa7296fd2b21dc77a4071c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Aug 2015 20:33:13 +0000 Subject: name conflicts solved git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MsgPopup/src/options.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/MsgPopup/src') diff --git a/plugins/MsgPopup/src/options.cpp b/plugins/MsgPopup/src/options.cpp index ab987af80d..7ef6719f42 100644 --- a/plugins/MsgPopup/src/options.cpp +++ b/plugins/MsgPopup/src/options.cpp @@ -38,6 +38,9 @@ static int __inline DBWriteContactSettingDwordDef(MCONTACT hContact, const char INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { + int value; + BOOL Translated; + switch (message) { case WM_INITDIALOG: TranslateDialogDefault(hWnd); @@ -50,8 +53,6 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l return TRUE; case WM_COMMAND: - int indx, value; - BOOL Translated; if (LOWORD(wParam) == IDC_PREVIEW) { MessageBox(0, TranslateT("Message with question"), TranslateTS(_T(SERVICENAME) _T(" - demo")), MB_ICONQUESTION); MessageBox(0, TranslateT("Message with exclamation"), TranslateTS(_T(SERVICENAME) _T(" - demo")), MB_ICONEXCLAMATION); @@ -64,7 +65,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l if (LOWORD(wParam) == IDC_MESSAGEBEEP) options.Sound = IsDlgButtonChecked(hWnd, IDC_MESSAGEBEEP) == BST_CHECKED; else { - for (indx = 0; indx < 4; indx++) { + for (int indx = 0; indx < 4; indx++) { if (LOWORD(wParam) == idOptionControls[indx][0]) { if (HIWORD(wParam) != CPN_COLOURCHANGED) return FALSE; options.FG[indx] = SendDlgItemMessage(hWnd, LOWORD(wParam), CPM_GETCOLOUR, 0, 0); @@ -96,9 +97,8 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l char szNameFG[4]; char szNameBG[4]; char szNameTO[4]; - int indx; - for (indx = 0; indx < 4; indx++) { + for (int indx = 0; indx < 4; indx++) { mir_snprintf(szNameFG, _countof(szNameFG), "FG%d", indx); mir_snprintf(szNameBG, _countof(szNameBG), "BG%d", indx); mir_snprintf(szNameTO, _countof(szNameTO), "TO%d", indx); -- cgit v1.2.3