less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

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

1 files changed, 10 insertions, 10 deletions

diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h
index a5bed3cef5..245db9db97 100644
--- a/plugins/TabSRMM/src/utils.h
+++ b/plugins/TabSRMM/src/utils.h
@@ -38,7 +38,7 @@
 

 struct TRTFColorTable

 {

-	TCHAR    szName[10];

+	wchar_t    szName[10];

 	COLORREF clr;

 	int      menuid;

 };

@@ -53,14 +53,14 @@ public:
 	};

 

 	static int      FindRTLLocale(TWindowData *dat);

-	static TCHAR*   GetPreviewWithEllipsis(TCHAR *szText, size_t iMaxLen);

-	static TCHAR*   FilterEventMarkers(TCHAR *wszText);

-	static LPCTSTR  FormatRaw(TWindowData *dat, const TCHAR *msg, int flags, BOOL isSent);

-	static bool     FormatTitleBar(const TWindowData *dat, const TCHAR *szFormat, CMString &dest);

+	static wchar_t*   GetPreviewWithEllipsis(wchar_t *szText, size_t iMaxLen);

+	static wchar_t*   FilterEventMarkers(wchar_t *wszText);

+	static LPCTSTR  FormatRaw(TWindowData *dat, const wchar_t *msg, int flags, BOOL isSent);

+	static bool     FormatTitleBar(const TWindowData *dat, const wchar_t *szFormat, CMString &dest);

 	static char*    FilterEventMarkers(char *szText);

-	static void     DoubleAmpersands(TCHAR *pszText, size_t len);

+	static void     DoubleAmpersands(wchar_t *pszText, size_t len);

 	static void     RTF_CTableInit();

-	static void     RTF_ColorAdd(const TCHAR *tszColname, size_t length);

+	static void     RTF_ColorAdd(const wchar_t *tszColname, size_t length);

 	static int      ReadContainerSettingsFromDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey = 0);

 	static int      WriteContainerSettingsToDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey = 0);

 	static void     SettingsToContainer(TContainerData *pContainer);

@@ -71,7 +71,7 @@ public:
 	static DWORD    CALLBACK StreamOut(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG * pcb);

 	static LRESULT  CmdDispatcher(UINT uType, HWND hwndDlg, UINT cmd, WPARAM wParam, LPARAM lParam, TWindowData *dat = 0, TContainerData *pContainer = 0);

 

-	static void     addMenuItem(const HMENU& m, MENUITEMINFO& mii, HICON hIcon, const TCHAR *szText, UINT uID, UINT pos);

+	static void     addMenuItem(const HMENU& m, MENUITEMINFO& mii, HICON hIcon, const wchar_t *szText, UINT uID, UINT pos);

 	static void     enableDlgControl(const HWND hwnd, UINT id, bool fEnable = true);

 	static void     showDlgControl(const HWND hwnd, UINT id, int showCmd);

 	static int      mustPlaySound(const TWindowData *dat);

@@ -79,7 +79,7 @@ public:
 	static void     setAvatarContact(HWND hWnd, MCONTACT hContact);

 	static void     getIconSize(HICON hIcon, int& sizeX, int& sizeY);

 

-	static bool     extractResource(const HMODULE h, const UINT uID, const TCHAR *tszName, const TCHAR *tszPath, const TCHAR *tszFilename, bool fForceOverwrite);

+	static bool     extractResource(const HMODULE h, const UINT uID, const wchar_t *tszName, const wchar_t *tszPath, const wchar_t *tszFilename, bool fForceOverwrite);

 	static void     scaleAvatarHeightLimited(const HBITMAP hBm, double& dNewWidth, double& dNewHeight, const LONG maxHeight);

 

 	static AVATARCACHEENTRY*  loadAvatarFromAVS(const MCONTACT hContact);

@@ -96,7 +96,7 @@ public:
 

 	static size_t   CopyToClipBoard(const wchar_t *str, const HWND hwndOwner);

 

-	static void     AddToFileList(TCHAR ***pppFiles, int *totalCount, LPCTSTR szFilename);

+	static void     AddToFileList(wchar_t ***pppFiles, int *totalCount, LPCTSTR szFilename);

 

 	//////////////////////////////////////////////////////////////////////////////////////

 	// safe mir_strlen function - do not overflow the given buffer length