- Another portion of _T replacement (patch from person)

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

6 files changed, 13 insertions, 16 deletions

diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp
index 318e4f13e0..0039df55bb 100644
--- a/plugins/Console/src/Console.cpp
+++ b/plugins/Console/src/Console.cpp
@@ -1259,10 +1259,10 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam)
 		CLISTMENUITEM mi = { sizeof(mi) };

 		mi.flags = CMIF_TCHAR;

 		mi.hIcon = hIcons[0];

-		mi.ptszPopupName = _T("&Help");

+		mi.ptszPopupName = LPGENT("&Help");

 		mi.popupPosition = 2000090000;

 		mi.position = 1000000000;

-		mi.ptszName = (IsWindowVisible(hwndConsole)) ? _T("Hide Console") : _T("Show Console");

+		mi.ptszName = (IsWindowVisible(hwndConsole)) ? LPGENT("Hide Console") : LPGENT("Show Console");

 		mi.pszService = MS_CONSOLE_SHOW_HIDE;

 		hMenu = Menu_AddMainMenuItem(&mi);

 

diff --git a/plugins/Dbx_tree/src/FileAccess.cpp b/plugins/Dbx_tree/src/FileAccess.cpp
index a0aa85aecb..fe23293f3f 100644
--- a/plugins/Dbx_tree/src/FileAccess.cpp
+++ b/plugins/Dbx_tree/src/FileAccess.cpp
@@ -275,14 +275,14 @@ void CFileAccess::InitJournal()
 		if (hfilebackup || hjrnfilebackup)

 		{

 			LOG(logWARNING,

-		      _T("Journal \"%s\" was found on start.\nBackup \"%s\"%s created and backup \"%s\"%s created.\nYou may delete these file(s) after successful start from \"%s\"."),

+		      TranslateT("Journal \"%s\" was found on start.\nBackup \"%s\"%s created and backup \"%s\"%s created.\nYou may delete these file(s) after successful start from \"%s\"."),

 			    fn?fn+1:m_Journal.FileName, 

-			    bfn?bfn+1:bckname, (hfilebackup!=INVALID_HANDLE_VALUE)?_T(" was successfully"):_T(" could not be"),

-			    jrn?jrn+1:bckjrnname, (hjrnfilebackup!=INVALID_HANDLE_VALUE)?_T(" was successfully"):_T(" could not be"),

+			    bfn?bfn+1:bckname, (hfilebackup!=INVALID_HANDLE_VALUE)?TranslateT(" was successfully"):TranslateT(" could not be"),

+			    jrn?jrn+1:bckjrnname, (hjrnfilebackup!=INVALID_HANDLE_VALUE)?TranslateT(" was successfully"):TranslateT(" could not be"),

 			    path);

 			} else {

 			LOG(logWARNING,

-					_T("Journal \"%s\" was found on start.\nBackups \"%s\"and \"%s\" could not be created in \"%s\"."),

+					TranslateT("Journal \"%s\" was found on start.\nBackups \"%s\"and \"%s\" could not be created in \"%s\"."),

 					fn?fn+1:m_Journal.FileName, 

 					bfn?bfn+1:bckname,

 					jrn?jrn+1:bckjrnname,

diff --git a/plugins/FTPFileYM/src/job_generic.cpp b/plugins/FTPFileYM/src/job_generic.cpp
index 17d9257e41..5ce7d3c504 100644
--- a/plugins/FTPFileYM/src/job_generic.cpp
+++ b/plugins/FTPFileYM/src/job_generic.cpp
@@ -48,7 +48,7 @@ int GenericJob::openFileDialog()
 	OPENFILENAME ofn = {0};

 	ofn.lStructSize = sizeof(ofn);

 	ofn.hwndOwner = 0;

-	ofn.lpstrFilter = _T("All Files (*.*)\0*.*\0");

+	ofn.lpstrFilter = TranslateT("All Files (*.*)\0*.*\0");

 	ofn.nFilterIndex = 1;

 	ofn.lpstrFile = this->stzFilePath;

 	ofn.lpstrTitle = TranslateT("FTP File - Select files");

diff --git a/plugins/FTPFileYM/src/job_packer.cpp b/plugins/FTPFileYM/src/job_packer.cpp
index bcc8ab02dc..2e81e57c89 100644
--- a/plugins/FTPFileYM/src/job_packer.cpp
+++ b/plugins/FTPFileYM/src/job_packer.cpp
@@ -256,10 +256,10 @@ void PackerJob::updateStats()
 		this->lastUpdateTick = dwNewTick;

 

 		double speed = ((double)this->uiReaded / 1024)/(time(NULL) - this->startTS);

-		mir_sntprintf(this->tab->stzSpeed, SIZEOF(this->tab->stzSpeed), _T("%0.1f kB/s"), speed);

+		mir_sntprintf(this->tab->stzSpeed, SIZEOF(this->tab->stzSpeed), TranslateT("%0.1f kB/s"), speed);

 

 		double perc = this->uiFileSize ? ((double)this->uiReaded / this->uiFileSize) * 100 : 0;

-		mir_sntprintf(this->tab->stzComplet, SIZEOF(this->tab->stzComplet), _T("%0.1f%% (%d kB/%d kB)"), perc, (int)this->uiReaded/1024, (int)this->uiFileSize/1024);

+		mir_sntprintf(this->tab->stzComplet, SIZEOF(this->tab->stzComplet), TranslateT("%0.1f%% (%d kB/%d kB)"), perc, (int)this->uiReaded/1024, (int)this->uiFileSize/1024);

 

 		TCHAR buff[256];

 		long s = (this->uiFileSize - this->uiReaded) / (long)(speed * 1024); 

@@ -270,7 +270,7 @@ void PackerJob::updateStats()
 

 		if (d > 0) mir_sntprintf(buff, SIZEOF(buff), _T("%dd %02d:%02d:%02d"), d, h, m, s);

 		else mir_sntprintf(buff, SIZEOF(buff), _T("%02d:%02d:%02d"), h, m, s);

-		mir_sntprintf(this->tab->stzRemain, SIZEOF(this->tab->stzRemain), _T("%s (%d kB/%d kB)"), buff, (this->uiFileSize - this->uiReaded)/1024, this->uiFileSize/1024);

+		mir_sntprintf(this->tab->stzRemain, SIZEOF(this->tab->stzRemain), TranslateT("%s (%d kB/%d kB)"), buff, (this->uiFileSize - this->uiReaded)/1024, this->uiFileSize/1024);

 

 		this->refreshTab(false);		

 	}

diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index 98b54270d6..44a08b7ae5 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -94,11 +94,8 @@ bool CoreCheck()
 		(g_mirandaVersion >= PLUGIN_MAKE_VERSION(1,0,0,0)))

 	{

 		MessageBoxA(0,

-			Translate(

-				"Favourite Contacts plugin was designed to be used with Miranda IM and Miranda NG only.\n"

-				"For use with any other application, please contact author.\n"

-				),

-			"Favourite Contacts Error",

+			Translate("Favourite Contacts plugin was designed to be used with Miranda IM and Miranda NG only.\nFor use with any other application, please contact author.\n"),

+			Translate("Favourite Contacts Error"),

 			MB_ICONSTOP|MB_OK);

 		return false;

 	}

diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 4deee87182..23170b405f 100644
--- a/plugins/FileAsMessage/src/main.cpp
+++ b/plugins/FileAsMessage/src/main.cpp
@@ -156,7 +156,7 @@ int OnOptInitialise(WPARAM wParam, LPARAM lParam)
 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

 	odp.ptszTitle = _T(SERVICE_TITLE);

-	odp.ptszGroup = _T("Plugins");

+	odp.ptszGroup = LPGENT("Plugins");

 	odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;

 	odp.pfnDlgProc = OptionsDlgProc;

 	Options_AddPage(wParam, &odp);