From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 27 Jul 2016 14:23:31 +0000
Subject: less TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TopToolBar/src/toolbar.cpp    | 12 ++++++------
 plugins/TopToolBar/src/toolbarwnd.cpp |  2 +-
 plugins/TopToolBar/src/ttbopt.cpp     |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/TopToolBar/src')

diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp
index 9b6f9721f0..d02ab8240a 100644
--- a/plugins/TopToolBar/src/toolbar.cpp
+++ b/plugins/TopToolBar/src/toolbar.cpp
@@ -177,7 +177,7 @@ TopButtonInt *CreateButton(TTBButton *but)
 		b->bPushed = (but->dwFlags & TTBBF_PUSHED) ? TRUE : FALSE;
 
 		if (but->dwFlags & TTBBF_ISLBUTTON) {
-			b->ptszProgram = mir_tstrdup(but->program);
+			b->ptszProgram = mir_wstrdup(but->program);
 			b->pszService = mir_strdup(TTB_LAUNCHSERVICE);
 		}
 		else {
@@ -190,8 +190,8 @@ TopButtonInt *CreateButton(TTBButton *but)
 		Icon2button(but, b->hIconHandleUp, b->hIconUp, true);
 		Icon2button(but, b->hIconHandleDn, b->hIconDn, false);
 
-		b->ptszTooltipUp = mir_a2t(but->pszTooltipUp);
-		b->ptszTooltipDn = mir_a2t(but->pszTooltipDn);
+		b->ptszTooltipUp = mir_a2u(but->pszTooltipUp);
+		b->ptszTooltipDn = mir_a2u(but->pszTooltipDn);
 	}
 	return b;
 }
@@ -399,7 +399,7 @@ INT_PTR TTBGetOptions(WPARAM wParam, LPARAM lParam)
 			lpTTB->wParamDown = b->wParamDown;
 
 			if (b->dwFlags & TTBBF_ISLBUTTON)
-				replaceStrT(lpTTB->program, b->ptszProgram);
+				replaceStrW(lpTTB->program, b->ptszProgram);
 			else
 				replaceStr(lpTTB->pszService, b->pszService);
 
@@ -440,7 +440,7 @@ INT_PTR TTBSetOptions(WPARAM wParam, LPARAM lParam)
 		if (lParam == 0)
 			return -1;
 
-		replaceStrT(b->ptszTooltip, TranslateTS(_A2T((LPCSTR)lParam)));
+		replaceStrW(b->ptszTooltip, TranslateTS(_A2T((LPCSTR)lParam)));
 		SendMessage(b->hwnd, BUTTONADDTOOLTIP, (WPARAM)b->ptszTooltip, BATF_UNICODE);
 		return 1;
 
@@ -467,7 +467,7 @@ INT_PTR TTBSetOptions(WPARAM wParam, LPARAM lParam)
 			}
 
 			if (b->dwFlags & TTBBF_ISLBUTTON)
-				replaceStrT(b->ptszProgram, lpTTB->program);
+				replaceStrW(b->ptszProgram, lpTTB->program);
 			else
 				replaceStr(b->pszService, lpTTB->pszService);
 
diff --git a/plugins/TopToolBar/src/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp
index 73661085dd..90f3199b24 100644
--- a/plugins/TopToolBar/src/toolbarwnd.cpp
+++ b/plugins/TopToolBar/src/toolbarwnd.cpp
@@ -299,7 +299,7 @@ int LoadBackgroundOptions()
 	}
 
 	if (db_get_b(NULL, TTB_OPTDIR, "UseBitmap", TTBDEFAULT_USEBITMAP)) {
-		ptrT tszBitmapName(db_get_tsa(NULL, TTB_OPTDIR, "BkBitmap"));
+		ptrW tszBitmapName(db_get_tsa(NULL, TTB_OPTDIR, "BkBitmap"));
 		if (tszBitmapName != NULL)
 			hBmpBackground = Bitmap_Load(tszBitmapName);
 	}
diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp
index b78101a566..e4a2edd8e5 100644
--- a/plugins/TopToolBar/src/ttbopt.cpp
+++ b/plugins/TopToolBar/src/ttbopt.cpp
@@ -33,7 +33,7 @@ static HTREEITEM AddLine(HWND hTree,TopButtonInt *b, HTREEITEM hItem, HIMAGELIST
 		}
 		else index = ImageList_AddIcon(il, b->hIconUp);
 
-		tmp = mir_a2t( b->pszName );
+		tmp = mir_a2u( b->pszName );
 		tvis.item.pszText = TranslateTS(tmp);
 	}
 	tvis.item.iImage = tvis.item.iSelectedImage = index;
@@ -298,7 +298,7 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 					TreeView_SetItem(hTree, &tvi);
 
 					GetDlgItemText(hwndDlg, IDC_EPATH, buf, _countof(buf));
-					replaceStrT(btn->ptszProgram, buf);
+					replaceStrW(btn->ptszProgram, buf);
 				}
 				break;
 			}
-- 
cgit v1.2.3