diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 | 
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 | 
| commit | 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac (patch) | |
| tree | 2e8bb660c908b54914abd562af8aafa4a486c846 /protocols/MinecraftDynmap/src | |
| parent | a61c8728b379057fe7f0a0d86fe0b037598229dd (diff) | |
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
Diffstat (limited to 'protocols/MinecraftDynmap/src')
| -rw-r--r-- | protocols/MinecraftDynmap/src/dialogs.cpp | 2 | ||||
| -rw-r--r-- | protocols/MinecraftDynmap/src/main.cpp | 2 | ||||
| -rw-r--r-- | protocols/MinecraftDynmap/src/proto.cpp | 12 | ||||
| -rw-r--r-- | protocols/MinecraftDynmap/src/proto.h | 2 | 
4 files changed, 9 insertions, 9 deletions
diff --git a/protocols/MinecraftDynmap/src/dialogs.cpp b/protocols/MinecraftDynmap/src/dialogs.cpp index a12d70b99c..28c428e30b 100644 --- a/protocols/MinecraftDynmap/src/dialogs.cpp +++ b/protocols/MinecraftDynmap/src/dialogs.cpp @@ -71,7 +71,7 @@ static void LoadDBText(MinecraftDynmapProto* ppro, HWND hwnd, int idCtrl, const  static void StoreDBText(MinecraftDynmapProto* ppro, HWND hwnd, int idCtrl, const char* szSetting)  { -	TCHAR tstr[250+1]; +	wchar_t tstr[250+1];  	GetDlgItemText(hwnd, idCtrl, tstr, _countof(tstr));  	if (tstr[0] != '\0') { diff --git a/protocols/MinecraftDynmap/src/main.cpp b/protocols/MinecraftDynmap/src/main.cpp index a4d6c02ed7..02cd9c4603 100644 --- a/protocols/MinecraftDynmap/src/main.cpp +++ b/protocols/MinecraftDynmap/src/main.cpp @@ -72,7 +72,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCO  /////////////////////////////////////////////////////////////////////////////////////////  // Load -static PROTO_INTERFACE* protoInit(const char *proto_name,const TCHAR *username) +static PROTO_INTERFACE* protoInit(const char *proto_name,const wchar_t *username)  {  	MinecraftDynmapProto *proto = new MinecraftDynmapProto(proto_name, username);  	g_Instances.insert(proto); diff --git a/protocols/MinecraftDynmap/src/proto.cpp b/protocols/MinecraftDynmap/src/proto.cpp index f2a15d6065..71c7932685 100644 --- a/protocols/MinecraftDynmap/src/proto.cpp +++ b/protocols/MinecraftDynmap/src/proto.cpp @@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "stdafx.h" -MinecraftDynmapProto::MinecraftDynmapProto(const char* proto_name, const TCHAR* username) : +MinecraftDynmapProto::MinecraftDynmapProto(const char* proto_name, const wchar_t* username) :  	PROTO<MinecraftDynmapProto>(proto_name, username), m_interval(0), hConnection(0), hEventsConnection(0),  	m_updateRate(5000), m_nick("")  { @@ -42,7 +42,7 @@ MinecraftDynmapProto::MinecraftDynmapProto(const char* proto_name, const TCHAR*  	HookProtoEvent(ME_GC_EVENT, &MinecraftDynmapProto::OnChatEvent);  	// Create standard network connection -	TCHAR descr[512]; +	wchar_t descr[512];  	NETLIBUSER nlu = {sizeof(nlu)};  	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;  	nlu.szSettingsModule = m_szModuleName; @@ -50,7 +50,7 @@ MinecraftDynmapProto::MinecraftDynmapProto(const char* proto_name, const TCHAR*  	nlu.ptszDescriptiveName = descr;  	m_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);  	if (m_hNetlibUser == NULL) { -		TCHAR error[200]; +		wchar_t error[200];  		mir_sntprintf(error, TranslateT("Unable to initialize Netlib for %s."), m_tszUserName);  		MessageBox(NULL, error, L"Miranda NG", MB_OK | MB_ICONERROR);  	} @@ -176,13 +176,13 @@ int MinecraftDynmapProto::OnModulesLoaded(WPARAM, LPARAM)  {  	OPTIONSDIALOGPAGE odp = { 0 };  	odp.hInstance   = g_hInstance; -	odp.ptszTitle   = m_tszUserName; +	odp.pwszTitle   = m_tszUserName;  	odp.dwInitParam = LPARAM(this);  	odp.flags       = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;  	odp.position    = 271828; -	odp.ptszGroup   = LPGENT("Network"); -	odp.ptszTab     = LPGENT("Account"); +	odp.pwszGroup   = LPGENW("Network"); +	odp.pwszTab     = LPGENW("Account");  	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);  	odp.pfnDlgProc  = MinecraftDynmapOptionsProc;  	Options_AddPage(wParam, &odp); diff --git a/protocols/MinecraftDynmap/src/proto.h b/protocols/MinecraftDynmap/src/proto.h index 774f0eddb5..65f67cc25b 100644 --- a/protocols/MinecraftDynmap/src/proto.h +++ b/protocols/MinecraftDynmap/src/proto.h @@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  class MinecraftDynmapProto : public PROTO<MinecraftDynmapProto>  {  public: -	MinecraftDynmapProto(const char *proto_name, const TCHAR *username); +	MinecraftDynmapProto(const char *proto_name, const wchar_t *username);  	~MinecraftDynmapProto();  	inline const char* ModuleName() const {  | 
