From 99962115431435cf17dfae4d3b7c8d7d55d824bf Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 8 Mar 2019 15:29:44 +0300
Subject: life is too short to remember whether this structure is zeroed or not

---
 plugins/ChangeKeyboardLayout/src/options.cpp       | 36 +++++++++++-----------
 .../ChangeKeyboardLayout/src/text_operations.cpp   | 34 ++++++++++----------
 2 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'plugins/ChangeKeyboardLayout/src')

diff --git a/plugins/ChangeKeyboardLayout/src/options.cpp b/plugins/ChangeKeyboardLayout/src/options.cpp
index 257acb225f..ae4c7bc0b8 100644
--- a/plugins/ChangeKeyboardLayout/src/options.cpp
+++ b/plugins/ChangeKeyboardLayout/src/options.cpp
@@ -352,43 +352,43 @@ INT_PTR CALLBACK DlgPopupsProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam,
 			if ((HIWORD(wParam) == BN_CLICKED )) {
 				ptszPopupPreviewText = (LPTSTR)mir_alloc(MaxTextSize*sizeof(wchar_t));
 
-				POPUPDATAW pdtData = { 0 };
-				wcsncpy(pdtData.lpwzContactName, TranslateT(MODULENAME), MAX_CONTACTNAME);
-				wcsncpy(pdtData.lpwzText, L"Ghbdtn? rfr ltkf&", MAX_SECONDLINE);
+				POPUPDATAW ppd;
+				wcsncpy(ppd.lpwzContactName, TranslateT(MODULENAME), MAX_CONTACTNAME);
+				wcsncpy(ppd.lpwzText, L"Ghbdtn? rfr ltkf&", MAX_SECONDLINE);
 
 				switch(poOptionsTemp.bColourType) {
 				case PPC_POPUP:
-					pdtData.colorBack = pdtData.colorText = 0;
+					ppd.colorBack = ppd.colorText = 0;
 					break;
 				case PPC_WINDOWS:
-					pdtData.colorBack = GetSysColor(COLOR_BTNFACE);
-					pdtData.colorText = GetSysColor(COLOR_WINDOWTEXT);
+					ppd.colorBack = GetSysColor(COLOR_BTNFACE);
+					ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);
 					break;
 				case PPC_CUSTOM:
-					pdtData.colorBack = poOptionsTemp.crBackColour;
-					pdtData.colorText = poOptionsTemp.crTextColour;
+					ppd.colorBack = poOptionsTemp.crBackColour;
+					ppd.colorText = poOptionsTemp.crTextColour;
 					break;
 				}						
 				
 				switch(poOptionsTemp.bTimeoutType) {
 				case PPT_POPUP:
-					pdtData.iSeconds = 0;
+					ppd.iSeconds = 0;
 					break;
 				case PPT_PERMANENT:
-					pdtData.iSeconds = -1;
+					ppd.iSeconds = -1;
 					break;
 				case PPC_CUSTOM:
-					pdtData.iSeconds = poOptionsTemp.bTimeout;
+					ppd.iSeconds = poOptionsTemp.bTimeout;
 					break;
 				}
-				mir_wstrcpy(ptszPopupPreviewText, pdtData.lpwzText);
-				pdtData.PluginData = ptszPopupPreviewText;
-				pdtData.lchIcon = hPopupIcon;
+				mir_wstrcpy(ptszPopupPreviewText, ppd.lpwzText);
+				ppd.PluginData = ptszPopupPreviewText;
+				ppd.lchIcon = hPopupIcon;
 				poOptions.paActions[0].lchIcon = hCopyIcon;
-				pdtData.lpActions = poOptions.paActions;
-				pdtData.actionCount = 1;
-				pdtData.PluginWindowProc = (WNDPROC)CKLPopupDlgProc;
-				if (PUAddPopupW(&pdtData) < 0)
+				ppd.lpActions = poOptions.paActions;
+				ppd.actionCount = 1;
+				ppd.PluginWindowProc = (WNDPROC)CKLPopupDlgProc;
+				if (PUAddPopupW(&ppd) < 0)
 					mir_free(ptszPopupPreviewText);
 			}
 			break;
diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp
index 094edd431f..dca4916e94 100644
--- a/plugins/ChangeKeyboardLayout/src/text_operations.cpp
+++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp
@@ -448,44 +448,44 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord)
 			LPTSTR ptszPopupText = (LPTSTR)mir_alloc(MaxTextSize*sizeof(wchar_t));
 			mir_wstrcpy(ptszPopupText, ptszMBox);
 
-			POPUPDATAW pdtData = { 0 };
-			wcsncpy(pdtData.lpwzContactName, TranslateT(MODULENAME), MAX_CONTACTNAME);
-			wcsncpy(pdtData.lpwzText, ptszPopupText, MAX_SECONDLINE);
+			POPUPDATAW ppd;
+			wcsncpy(ppd.lpwzContactName, TranslateT(MODULENAME), MAX_CONTACTNAME);
+			wcsncpy(ppd.lpwzText, ptszPopupText, MAX_SECONDLINE);
 
 			switch (poOptions.bColourType) {
 			case PPC_POPUP:
-				pdtData.colorBack = pdtData.colorText = 0;
+				ppd.colorBack = ppd.colorText = 0;
 				break;
 			case PPC_WINDOWS:
-				pdtData.colorBack = GetSysColor(COLOR_BTNFACE);
-				pdtData.colorText = GetSysColor(COLOR_WINDOWTEXT);
+				ppd.colorBack = GetSysColor(COLOR_BTNFACE);
+				ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);
 				break;
 			case PPC_CUSTOM:
-				pdtData.colorBack = poOptions.crBackColour;
-				pdtData.colorText = poOptions.crTextColour;
+				ppd.colorBack = poOptions.crBackColour;
+				ppd.colorText = poOptions.crTextColour;
 				break;
 			}
 
 			switch (poOptions.bTimeoutType) {
 			case PPT_POPUP:
-				pdtData.iSeconds = 0;
+				ppd.iSeconds = 0;
 				break;
 			case PPT_PERMANENT:
-				pdtData.iSeconds = -1;
+				ppd.iSeconds = -1;
 				break;
 			case PPC_CUSTOM:
-				pdtData.iSeconds = poOptions.bTimeout;
+				ppd.iSeconds = poOptions.bTimeout;
 				break;
 			}
-			pdtData.PluginData = ptszPopupText;
-			pdtData.PluginWindowProc = (WNDPROC)CKLPopupDlgProc;
+			ppd.PluginData = ptszPopupText;
+			ppd.PluginWindowProc = (WNDPROC)CKLPopupDlgProc;
 
-			pdtData.lchIcon = hPopupIcon;
+			ppd.lchIcon = hPopupIcon;
 			poOptions.paActions[0].lchIcon = hCopyIcon;
-			pdtData.lpActions = poOptions.paActions;
-			pdtData.actionCount = 1;
+			ppd.lpActions = poOptions.paActions;
+			ppd.actionCount = 1;
 
-			if (PUAddPopupW(&pdtData) < 0) {
+			if (PUAddPopupW(&ppd) < 0) {
 				mir_free(ptszPopupText);
 				MessageBox(nullptr, ptszMBox, TranslateT(MODULENAME), MB_ICONINFORMATION);
 			}
-- 
cgit v1.2.3