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

4 files changed, 10 insertions, 11 deletions

diff --git a/protocols/Dummy/src/dummy_proto.cpp b/protocols/Dummy/src/dummy_proto.cpp
index 533b137199..11643b57b3 100644
--- a/protocols/Dummy/src/dummy_proto.cpp
+++ b/protocols/Dummy/src/dummy_proto.cpp
@@ -39,7 +39,7 @@ void CDummyProto::SearchIdAckThread(void *targ)
 	PROTOSEARCHRESULT psr = { 0 };
 	psr.cbSize = sizeof(psr);
 	psr.flags = PSR_TCHAR;
-	psr.id.t = (TCHAR*)targ;
+	psr.id.w = (wchar_t*)targ;
 	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, targ, (LPARAM)&psr);
 	
 	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, targ, 0);
@@ -54,7 +54,7 @@ static int sttCompareProtocols(const CDummyProto *p1, const CDummyProto *p2)
 
 LIST<CDummyProto> dummy_Instances(1, sttCompareProtocols);
 
-CDummyProto::CDummyProto(const char *szModuleName, const TCHAR *ptszUserName) :
+CDummyProto::CDummyProto(const char *szModuleName, const wchar_t *ptszUserName) :
 	PROTO<CDummyProto>(szModuleName, ptszUserName)
 {
 	CreateProtoService(PS_CREATEACCMGRUI, &CDummyProto::SvcCreateAccMgrUI);
@@ -142,19 +142,19 @@ int CDummyProto::SetStatus(int)
 	return 0;
 }
 
-HANDLE CDummyProto::SearchBasic(const TCHAR* id)
+HANDLE CDummyProto::SearchBasic(const wchar_t* id)
 {
 	if (uniqueIdSetting[0] == '\0')
 		return 0;
 
-	TCHAR *tid = mir_tstrdup(id);
+	wchar_t *tid = mir_tstrdup(id);
 	ForkThread(&CDummyProto::SearchIdAckThread, tid);
 	return tid;
 }
 
 MCONTACT CDummyProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 {
-	if (psr->id.t == NULL)
+	if (psr->id.w == NULL)
 		return NULL;
 
 	MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD);
@@ -173,8 +173,8 @@ MCONTACT CDummyProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 			db_unset(hContact, "CList", "Hidden");
 			db_unset(hContact, "CList", "NotOnList");
 		}
-		setTString(hContact, uniqueIdSetting, psr->id.t);
-		setTString(hContact, "Nick", psr->id.t);
+		setTString(hContact, uniqueIdSetting, psr->id.w);
+		setTString(hContact, "Nick", psr->id.w);
 	}
 
 	return hContact;
diff --git a/protocols/Dummy/src/dummy_proto.h b/protocols/Dummy/src/dummy_proto.h
index d2da9b0d61..2543c949da 100644
--- a/protocols/Dummy/src/dummy_proto.h
+++ b/protocols/Dummy/src/dummy_proto.h
@@ -19,7 +19,7 @@ struct CDummyProto;
 
 struct CDummyProto : public PROTO<CDummyProto>
 {
-				CDummyProto(const char*, const TCHAR*);
+				CDummyProto(const char*, const wchar_t*);
 				~CDummyProto();
 
 	//====================================================================================
@@ -32,7 +32,7 @@ struct CDummyProto : public PROTO<CDummyProto>
 
 	virtual	int       __cdecl SetStatus(int iNewStatus);
 
-	virtual	HANDLE    __cdecl SearchBasic(const TCHAR* id);
+	virtual	HANDLE    __cdecl SearchBasic(const wchar_t* id);
 
 	virtual	MCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);
 
diff --git a/protocols/Dummy/src/main.cpp b/protocols/Dummy/src/main.cpp
index 87b112e219..8eff3f47ae 100644
--- a/protocols/Dummy/src/main.cpp
+++ b/protocols/Dummy/src/main.cpp
@@ -63,7 +63,7 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 /////////////////////////////////////////////////////////////////////////////////////////

 // OnLoad - initialize the plugin instance

 

-static CDummyProto* dummyProtoInit(const char* pszProtoName, const TCHAR *tszUserName)

+static CDummyProto* dummyProtoInit(const char* pszProtoName, const wchar_t *tszUserName)

 {

 	CDummyProto *ppro = new CDummyProto(pszProtoName, tszUserName);

 	return ppro;

diff --git a/protocols/Dummy/src/stdafx.h b/protocols/Dummy/src/stdafx.h
index 305d636215..a28d1fd992 100644
--- a/protocols/Dummy/src/stdafx.h
+++ b/protocols/Dummy/src/stdafx.h
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdio.h>
 #include <malloc.h>
-#include <tchar.h>
 #include <time.h>
 
 #include <newpluginapi.h>