name conflicts solved

git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 2 insertions, 4 deletions

diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp
index 6dfe850baf..7249e7bfc7 100644
--- a/plugins/DbEditorPP/src/main_window.cpp
+++ b/plugins/DbEditorPP/src/main_window.cpp
@@ -193,6 +193,8 @@ static LRESULT CALLBACK SettingListSubclassProc(HWND hwnd, UINT msg, WPARAM wPar
 

 INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

+	TCHAR text[256];

+

 	switch (msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwnd);

@@ -307,7 +309,6 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 

 			if (item = TreeView_GetSelection(hwnd2Tree)) {

 				int type = MODULE;

-				TCHAR text[FLD_SIZE];

 				TVITEM tvi = { 0 };

 				tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT;

 				tvi.pszText = text;

@@ -394,8 +395,6 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 

 		case MENU_REFRESH_SETS:

 			TVITEM tvi;

-

-			TCHAR text[FLD_SIZE];

 			tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT;

 			tvi.hItem = TreeView_GetSelection(hwnd2Tree);

 			tvi.pszText = text; // modulename

@@ -444,7 +443,6 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		case MENU_FIX_RESIDENT:

 			if (dlg(TranslateT("Delete resident settings from database?"), MB_YESNO | MB_ICONEXCLAMATION) == IDYES) {

 				int cnt = fixResidentSettings();

-				TCHAR text[MSG_SIZE];

 				mir_sntprintf(text, TranslateT("%d orphaned items deleted."), cnt);

 				msg(text);

 			}