From 0c060267ccea726d5c2c2fd1e45d1f16965fb01e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Aug 2015 23:08:55 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14975 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PackUpdater/Src/Notifications.cpp | 18 +++++++++--------- plugins/PackUpdater/Src/Options.cpp | 2 +- plugins/PackUpdater/Src/Utils.cpp | 18 +++++++++--------- plugins/PackUpdater/Src/stdafx.h | 16 ++++++++-------- 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'plugins/PackUpdater') diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp index abb89e65c5..656219ef27 100644 --- a/plugins/PackUpdater/Src/Notifications.cpp +++ b/plugins/PackUpdater/Src/Notifications.cpp @@ -87,7 +87,7 @@ static INT_PTR CALLBACK PopupDlgProc2(HWND hDlg, UINT uMsg, WPARAM wParam, LPARA return DefWindowProc(hDlg, uMsg, wParam, lParam); } -static VOID MakePopupAction(POPUPACTION &pa, INT id) +static void MakePopupAction(POPUPACTION &pa, INT id) { pa.cbSize = sizeof(POPUPACTION); pa.flags = PAF_ENABLED; @@ -105,7 +105,7 @@ static VOID MakePopupAction(POPUPACTION &pa, INT id) } } -VOID show_popup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, int Number, int ActType) +void show_popup(HWND hDlg, LPCTSTR pszTitle, LPCTSTR pszText, int iNumber, int ActType) { LPMSGPOPUPDATA pmpd = (LPMSGPOPUPDATA)mir_alloc(sizeof(MSGPOPUPDATA)); if (!pmpd) @@ -114,28 +114,28 @@ VOID show_popup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, int Number, int ActType) POPUPDATAT_V2 pd = { 0 }; pd.cbSize = sizeof(pd); pd.lchContact = NULL; //(HANDLE)wParam; - pd.lchIcon = Skin_LoadIcon(PopupsList[Number].Icon); - mir_tstrncpy(pd.lptzText, Text, _countof(pd.lptzText)); - mir_tstrncpy(pd.lptzContactName, Title, _countof(pd.lptzContactName)); + pd.lchIcon = Skin_LoadIcon(PopupsList[iNumber].Icon); + mir_tstrncpy(pd.lptzText, pszText, _countof(pd.lptzText)); + mir_tstrncpy(pd.lptzContactName, pszTitle, _countof(pd.lptzContactName)); switch (MyOptions.DefColors) { case byCOLOR_WINDOWS: pd.colorBack = GetSysColor(COLOR_BTNFACE); pd.colorText = GetSysColor(COLOR_WINDOWTEXT); break; case byCOLOR_OWN: - pd.colorBack = PopupsList[Number].colorBack; - pd.colorText = PopupsList[Number].colorText; + pd.colorBack = PopupsList[iNumber].colorBack; + pd.colorText = PopupsList[iNumber].colorText; break; case byCOLOR_POPUP: pd.colorBack = pd.colorText = 0; break; } - if (Number == 0 && ActType != 0) + if (iNumber == 0 && ActType != 0) pd.PluginWindowProc = (WNDPROC)PopupDlgProc; else pd.PluginWindowProc = (WNDPROC)PopupDlgProc2; pd.PluginData = pmpd; - if (Number == 0) + if (iNumber == 0) pd.iSeconds = -1; else pd.iSeconds = MyOptions.Timeout; diff --git a/plugins/PackUpdater/Src/Options.cpp b/plugins/PackUpdater/Src/Options.cpp index a0ecf9820a..53a498be66 100644 --- a/plugins/PackUpdater/Src/Options.cpp +++ b/plugins/PackUpdater/Src/Options.cpp @@ -292,7 +292,7 @@ INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) case IDC_PREVIEW: Title = TranslateT("Pack Updater"); Text = TranslateT("Test"); - for (int i = 0; i < POPUPS; i++) { + for (i = 0; i < POPUPS; i++) { if ((BST_UNCHECKED == IsDlgButtonChecked(hdlg, (i + 40071))) || (!IsWindowEnabled(GetDlgItem(hdlg, (i + 40071))))) continue; show_popup(0, Title, Text, i, 0); diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp index 10dd3a5c05..5c2d660079 100644 --- a/plugins/PackUpdater/Src/Utils.cpp +++ b/plugins/PackUpdater/Src/Utils.cpp @@ -41,7 +41,7 @@ IconItem iconList[] = { LPGEN("'No' Button"), "btn_cancel", IDI_CANCEL } }; -VOID IcoLibInit() +void IcoLibInit() { Icon_Register(hInst, MODULEA, iconList, _countof(iconList)); } @@ -58,13 +58,13 @@ BOOL NetlibInit() return hNetlibUser != NULL; } -VOID NetlibUnInit() +void NetlibUnInit() { Netlib_CloseHandle(hNetlibUser); hNetlibUser = NULL; } -VOID InitPopupList() +void InitPopupList() { int index = 0; PopupsList[index].ID = index; @@ -91,7 +91,7 @@ VOID InitPopupList() PopupsList[index].colorText = db_get_dw(NULL, MODNAME, "Popups3Tx", COLOR_TX_DEFAULT); } -VOID LoadOptions() +void LoadOptions() { MyOptions.DefColors = db_get_b(NULL, MODNAME, "DefColors", DEFAULT_COLORS); MyOptions.LeftClickAction = db_get_b(NULL, MODNAME, "LeftClickAction", DEFAULT_POPUP_LCLICK); @@ -147,12 +147,12 @@ BOOL DownloadFile(LPCTSTR tszURL, LPCTSTR tszLocal) return ret; } -VOID __stdcall ExitMe(void*) +void __stdcall ExitMe(void*) { CallService("CloseAction", 0, 0); } -VOID __stdcall RestartMe(void*) +void __stdcall RestartMe(void*) { CallService(MS_SYSTEM_RESTART, 1, 0); } @@ -172,7 +172,7 @@ BOOL IsPluginDisabled(TCHAR* filename) size_t getVer(const TCHAR* verStr) { - size_t v1 = 0, v2 = 0, v3 = 0, v4 = 0; + int v1 = 0, v2 = 0, v3 = 0, v4 = 0; _stscanf(verStr, _T("%d.%d.%d.%d"), &v1, &v2, &v3, &v4); return v1 * 10000000 + v2 * 100000 + v3 * 1000 + v4; } @@ -410,12 +410,12 @@ LONG PeriodToMilliseconds(const INT period, BYTE& periodMeasure) return result; } -VOID CALLBACK TimerAPCProc(LPVOID, DWORD, DWORD) +void CALLBACK TimerAPCProc(LPVOID, DWORD, DWORD) { DoCheck(TRUE); } -VOID InitTimer() +void InitTimer() { CancelWaitableTimer(Timer); if (UpdateOnPeriod) { diff --git a/plugins/PackUpdater/Src/stdafx.h b/plugins/PackUpdater/Src/stdafx.h index 0c6eeafa2f..a52356f503 100644 --- a/plugins/PackUpdater/Src/stdafx.h +++ b/plugins/PackUpdater/Src/stdafx.h @@ -100,23 +100,23 @@ extern aPopups PopupsList[POPUPS]; extern LPCTSTR Title, Text; extern HANDLE Timer; -VOID InitPopupList(); -VOID LoadOptions(); +void InitPopupList(); +void LoadOptions(); BOOL NetlibInit(); -VOID IcoLibInit(); -VOID NetlibUnInit(); +void IcoLibInit(); +void NetlibUnInit(); INT ModulesLoaded(WPARAM wParam, LPARAM lParam); INT_PTR MenuCommand(WPARAM wParam, LPARAM lParam); INT_PTR EmptyFolder(WPARAM wParam, LPARAM lParam); INT OnPreShutdown(WPARAM wParam, LPARAM lParam); INT OptInit(WPARAM wParam, LPARAM lParam); -VOID DoCheck(INT iFlag); +void DoCheck(INT iFlag); BOOL DownloadFile(LPCTSTR tszURL, LPCTSTR tszLocal); -VOID show_popup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, INT Number, INT ActType); -VOID DlgDownloadProc(); +void show_popup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, INT Number, INT ActType); +void DlgDownloadProc(); INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK DlgMsgPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); void __stdcall ExitMe(void*); void __stdcall RestartMe(void*); BOOL AllowUpdateOnStartup(); -VOID InitTimer(); \ No newline at end of file +void InitTimer(); -- cgit v1.2.3