hello, Unix.

phase 1: removing _T()

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

3 files changed, 26 insertions, 26 deletions

diff --git a/plugins/Db_autobackups/src/backup.cpp b/plugins/Db_autobackups/src/backup.cpp
index ba8c06e591..53a2dad93a 100644
--- a/plugins/Db_autobackups/src/backup.cpp
+++ b/plugins/Db_autobackups/src/backup.cpp
@@ -11,7 +11,7 @@ LRESULT CALLBACK DlgProcPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	{

 		TCHAR* ptszPath = (TCHAR*)PUGetPluginData(hWnd);

 		if (ptszPath != 0)

-			ShellExecute(0, _T("open"), ptszPath, NULL, NULL, SW_SHOW);

+			ShellExecute(0, L"open", ptszPath, NULL, NULL, SW_SHOW);

 

 		PUDeletePopup(hWnd);

 		break;

@@ -149,7 +149,7 @@ int RotateBackups(TCHAR *backupfolder, TCHAR *dbname)
 

 	if (options.num_backups == 0)

 		return 0; /* Roration disabled. */

-	mir_sntprintf(backupfolderTmp, _T("%s\\%s*"), backupfolder, dbname);

+	mir_sntprintf(backupfolderTmp, L"%s\\%s*", backupfolder, dbname);

 	hFind = FindFirstFile(backupfolderTmp, &FindFileData);

 	if (hFind == INVALID_HANDLE_VALUE)

 		return 0;

@@ -169,7 +169,7 @@ int RotateBackups(TCHAR *backupfolder, TCHAR *dbname)
 	if (i > 0)

 		qsort(bf, i, sizeof(backupFile), Comp); /* Sort the list of found files by date in descending order. */

 	for (; i >= options.num_backups; i --) {

-		mir_sntprintf(backupfolderTmp, _T("%s\\%s"), backupfolder, bf[(i - 1)].Name);

+		mir_sntprintf(backupfolderTmp, L"%s\\%s", backupfolder, bf[(i - 1)].Name);

 		DeleteFile(backupfolderTmp);

 	}

 err_out:

@@ -205,12 +205,12 @@ int Backup(TCHAR *backup_filename)
 

 		GetLocalTime(&st);

 		GetComputerName(buffer, &size);

-		mir_sntprintf(dest_file, _T("%s\\%s_%02d.%02d.%02d@%02d-%02d-%02d_%s.%s"), backupfolder, dbname, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, buffer, bZip ? _T("zip") : _T("dat"));

+		mir_sntprintf(dest_file, L"%s\\%s_%02d.%02d.%02d@%02d-%02d-%02d_%s.%s", backupfolder, dbname, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, buffer, bZip ? L"zip" : L"dat");

 		mir_free(backupfolder);

 	}

 	else {

 		_tcsncpy_s(dest_file, backup_filename, _TRUNCATE);

-		if (!mir_tstrcmp(_tcsrchr(backup_filename, _T('.')), _T(".zip")))

+		if (!mir_tstrcmp(_tcsrchr(backup_filename, _T('.')), L".zip"))

 			bZip = true;

 	}

 	if (!options.disable_popups)

@@ -221,7 +221,7 @@ int Backup(TCHAR *backup_filename)
 

 	SetDlgItemText(progress_dialog, IDC_PROGRESSMESSAGE, TranslateT("Copying database file..."));

 

-	mir_sntprintf(source_file, _T("%s\\%s"), profilePath, dbname);

+	mir_sntprintf(source_file, L"%s\\%s", profilePath, dbname);

 	TCHAR *pathtmp = Utils_ReplaceVarsT(source_file);

 	BOOL res = 0;

 	if (bZip)

@@ -247,7 +247,7 @@ int Backup(TCHAR *backup_filename)
 

 		if (options.use_dropbox)

 		{

-			DropboxUploadInfo ui = { dest_file, _T("Backups") };

+			DropboxUploadInfo ui = { dest_file, L"Backups" };

 			if (CallService(MS_DROPBOX_UPLOAD, NULL, (LPARAM)&ui))

 				ShowPopup(TranslateT("Uploading to Dropbox failed"), TranslateT("Error"), nullptr);

 		}

@@ -263,7 +263,7 @@ int Backup(TCHAR *backup_filename)
 					;

 				//_tcsncpy_s(dest_file, backup_filename, _TRUNCATE);

 				mir_tstrncpy(puText, dest_file, (i + 2));

-				mir_tstrcat(puText, _T("\n"));

+				mir_tstrcat(puText, L"\n");

 				mir_tstrcat(puText, (dest_file + i + 1));

 			}

 			else

diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp
index 9fcb46970a..ea26811a07 100644
--- a/plugins/Db_autobackups/src/main.cpp
+++ b/plugins/Db_autobackups/src/main.cpp
@@ -38,7 +38,7 @@ static INT_PTR DBSaveAs(WPARAM, LPARAM)
 	OPENFILENAME ofn = { 0 };

 	CallService(MS_DB_GETPROFILENAMET, _countof(fname_buff), (LPARAM)fname_buff);

 

-	mir_sntprintf(tszFilter, _T("%s (*.dat)%c*.dat%c%s (*.zip)%c*.zip%c%s (*.*)%c*%c"),

+	mir_sntprintf(tszFilter, L"%s (*.dat)%c*.dat%c%s (*.zip)%c*.zip%c%s (*.*)%c*%c",

 		TranslateT("Miranda NG databases"), 0, 0,

 		TranslateT("Compressed Miranda NG databases"), 0, 0,

 		TranslateT("All files"), 0, 0);

@@ -49,7 +49,7 @@ static INT_PTR DBSaveAs(WPARAM, LPARAM)
 	ofn.Flags = OFN_NOREADONLYRETURN | OFN_OVERWRITEPROMPT;

 	ofn.lpstrFilter = tszFilter;

 	ofn.nFilterIndex = 1;

-	ofn.lpstrDefExt = _T("dat");

+	ofn.lpstrDefExt = L"dat";

 

 	if (GetSaveFileName(&ofn))

 		BackupStart(fname_buff);

@@ -81,7 +81,7 @@ static int ModulesLoad(WPARAM, LPARAM)
 	mi.position = 500100001;

 	Menu_AddMainMenuItem(&mi);

 

-	profilePath = Utils_ReplaceVarsT(_T("%miranda_userdata%"));

+	profilePath = Utils_ReplaceVarsT(L"%miranda_userdata%");

 

 	if (hFolder = FoldersRegisterCustomPathT(LPGEN("Database backups"), LPGEN("Backup folder"), DIR SUB_DIR)) {

 		HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersGetBackupPath);

diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp
index ecb594101e..7c7aacf482 100644
--- a/plugins/Db_autobackups/src/options.cpp
+++ b/plugins/Db_autobackups/src/options.cpp
@@ -48,12 +48,12 @@ int LoadOptions(void)
 			if (mir_tstrlen(tmp) >= 2 && tmp[1] == ':')

 				_tcsncpy_s(options.folder, dbv.ptszVal, _TRUNCATE);

 			else

-				mir_sntprintf(options.folder, _T("%s\\%s"), profilePath, dbv.ptszVal);

+				mir_sntprintf(options.folder, L"%s\\%s", profilePath, dbv.ptszVal);

 

 			db_free(&dbv);

 			mir_free(tmp);

 		}

-		else mir_sntprintf(options.folder, _T("%s%s"), DIR, SUB_DIR);

+		else mir_sntprintf(options.folder, L"%s%s", DIR, SUB_DIR);

 	}

 	options.num_backups = db_get_w(0, "AutoBackups", "NumBackups", 3);

 

@@ -77,7 +77,7 @@ int SaveOptions(void)
 	db_set_w(0, "AutoBackups", "Period", (WORD)options.period);

 	db_set_b(0, "AutoBackups", "PeriodType", (BYTE)options.period_type);

 

-	mir_sntprintf(prof_dir, _T("%s\\"), profilePath);

+	mir_sntprintf(prof_dir, L"%s\\", profilePath);

 	size_t prof_len = mir_tstrlen(prof_dir);

 	size_t opt_len = mir_tstrlen(options.folder);

 

@@ -90,7 +90,7 @@ int SaveOptions(void)
 	TCHAR *tmp = Utils_ReplaceVarsT(options.folder);

 	if (mir_tstrlen(tmp) < 2 || tmp[1] != ':') {

 		_tcsncpy_s(prof_dir, options.folder, _TRUNCATE);

-		mir_sntprintf(options.folder, _T("%s\\%s"), profilePath, prof_dir);

+		mir_sntprintf(options.folder, L"%s\\%s", profilePath, prof_dir);

 	}

 	mir_free(tmp);

 	db_set_w(0, "AutoBackups", "NumBackups", options.num_backups);

@@ -195,16 +195,16 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		}

 		else {

 			TCHAR tszTooltipText[4096];

-			mir_sntprintf(tszTooltipText, _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

-				_T("%miranda_path%"), TranslateT("path to Miranda root folder"),

-				_T("%miranda_profilesdir%"), TranslateT("path to folder containing Miranda profiles"),

-				_T("%miranda_profilename%"), TranslateT("name of current Miranda profile (filename, without extension)"),

-				_T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),

-				_T("%appdata%"), TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),

-				_T("%username%"), TranslateT("username for currently logged-on Windows user"),

-				_T("%mydocuments%"), TranslateT("\"My Documents\" folder for currently logged-on Windows user"),

-				_T("%desktop%"), TranslateT("\"Desktop\" folder for currently logged-on Windows user"),

-				_T("%xxxxxxx%"), TranslateT("any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)")

+			mir_sntprintf(tszTooltipText, L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s",

+				L"%miranda_path%", TranslateT("path to Miranda root folder"),

+				L"%miranda_profilesdir%", TranslateT("path to folder containing Miranda profiles"),

+				L"%miranda_profilename%", TranslateT("name of current Miranda profile (filename, without extension)"),

+				L"%miranda_userdata%", TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),

+				L"%appdata%", TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),

+				L"%username%", TranslateT("username for currently logged-on Windows user"),

+				L"%mydocuments%", TranslateT("\"My Documents\" folder for currently logged-on Windows user"),

+				L"%desktop%", TranslateT("\"Desktop\" folder for currently logged-on Windows user"),

+				L"%xxxxxxx%", TranslateT("any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)")

 				);

 			hPathTip = CreateToolTip(GetDlgItem(hwndDlg, IDC_ED_FOLDER), tszTooltipText, TranslateT("Variables"));

 		}

@@ -362,7 +362,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (mir_tstrlen(tmp) >= 2 && tmp[1] == ':')

 					_tcsncpy_s(backupfolder, tmp, _TRUNCATE);

 				else

-					mir_sntprintf(backupfolder, _T("%s\\%s"), profilePath, tmp);

+					mir_sntprintf(backupfolder, L"%s\\%s", profilePath, tmp);

 				mir_free(tmp);

 

 				int err = CreateDirectoryTreeT(backupfolder);