no more TCHARs

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

4 files changed, 10 insertions, 10 deletions

diff --git a/plugins/MirFox/src/MirandaInterface.cpp b/plugins/MirFox/src/MirandaInterface.cpp
index 299a3635d6..75d379347d 100644
--- a/plugins/MirFox/src/MirandaInterface.cpp
+++ b/plugins/MirFox/src/MirandaInterface.cpp
@@ -111,7 +111,7 @@ static int onModulesLoaded(WPARAM, LPARAM)
 	puc.flags = PCF_TCHAR;

 

 	puc.pszName = "MirFox_Notify";

-	puc.ptszDescription = TranslateT("MirFox/Notification");

+	puc.pwszDescription = TranslateT("MirFox/Notification");

 	puc.colorBack = RGB(173, 206, 247); //light blue

 	puc.colorText = GetSysColor(COLOR_WINDOWTEXT);

 	puc.iSeconds = 3;

@@ -119,7 +119,7 @@ static int onModulesLoaded(WPARAM, LPARAM)
 	hPopupNotify = Popup_RegisterClass(&puc);

 

 	puc.pszName = "MirFox_Error";

-	puc.ptszDescription = TranslateT("MirFox/Error");

+	puc.pwszDescription = TranslateT("MirFox/Error");

 	puc.colorBack = RGB(255, 128, 128); //light red

 	puc.colorText = GetSysColor(COLOR_WINDOWTEXT);

 	puc.iSeconds = 20;

diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp
index 7ea8ece4f5..20e1d42c30 100644
--- a/plugins/MirFox/src/MirandaOptions.cpp
+++ b/plugins/MirFox/src/MirandaOptions.cpp
@@ -145,7 +145,7 @@ INT_PTR CALLBACK DlgProcOpts_Tab1(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 			MFLogger* logger = MFLogger::getInstance();

 			logger->log_p(L"Options. Save clientsProfilesFilterString: [%s]", mirfoxMiranda.getMirfoxData().getClientsProfilesFilterStringPtr()->c_str());

-			db_set_ts(0, PLUGIN_DB_ID, "clientsProfilesFilterString", mirfoxMiranda.getMirfoxData().getClientsProfilesFilterStringPtr()->c_str());

+			db_set_ws(0, PLUGIN_DB_ID, "clientsProfilesFilterString", mirfoxMiranda.getMirfoxData().getClientsProfilesFilterStringPtr()->c_str());

 

 			//TODO fire actualization visableTo field at CSM record

 

diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp
index a29245cff6..7a9a5e54b1 100644
--- a/plugins/MirFox/src/MirandaUtils.cpp
+++ b/plugins/MirFox/src/MirandaUtils.cpp
@@ -31,7 +31,7 @@ void MirandaUtils::netlibRegister(){
 	// Register netlib user for logging function

 	NETLIBUSER nlu = { 0 };

 	nlu.cbSize = sizeof(nlu);

-	nlu.flags = NUF_TCHAR | NUF_NOOPTIONS;

+	nlu.flags = NUF_UNICODE | NUF_NOOPTIONS;

 	nlu.szSettingsModule = PLUGIN_DB_ID;

 	nlu.ptszDescriptiveName = TranslateT("MirFox log");

 

@@ -343,13 +343,13 @@ int MirandaUtils::on_hook_OpenMW(WPARAM wParam, LPARAM lParam)
 

 	if (param->msgBuffer != NULL){

 		wchar_t *msgBuffer = mir_wstrdup(param->msgBuffer->c_str());

-		CallServiceSync(MS_MSG_SENDMESSAGET, (WPARAM)param->targetHandle, (LPARAM)msgBuffer);

+		CallServiceSync(MS_MSG_SENDMESSAGEW, (WPARAM)param->targetHandle, (LPARAM)msgBuffer);

 		mir_free(msgBuffer);

 

 		delete param->msgBuffer;

 	} else {

 		//only open window

-		CallServiceSync(MS_MSG_SENDMESSAGET, (WPARAM)param->targetHandle, 0);

+		CallServiceSync(MS_MSG_SENDMESSAGEW, (WPARAM)param->targetHandle, 0);

 	}

 

 	// show and focus window

@@ -487,10 +487,10 @@ void MirandaUtils::translateOldDBNames() {
 	}

 

 	DBVARIANT opt2Dbv = {0};

-	INT_PTR opt2Result = db_get_s(0, OLD_PLUGIN_DB_ID, "clientsProfilesFilterString", &opt2Dbv, DBVT_TCHAR);

+	INT_PTR opt2Result = db_get_s(0, OLD_PLUGIN_DB_ID, "clientsProfilesFilterString", &opt2Dbv, DBVT_WCHAR);

 	if (opt2Result == 0){	//success

 		std::wstring clientsProfilesFilterString = opt2Dbv.pwszVal;

-		db_set_ts(0, PLUGIN_DB_ID, "clientsProfilesFilterString", clientsProfilesFilterString.c_str());

+		db_set_ws(0, PLUGIN_DB_ID, "clientsProfilesFilterString", clientsProfilesFilterString.c_str());

 		db_unset(0, OLD_PLUGIN_DB_ID, "clientsProfilesFilterString");

 		logger->log(L"TranslateOldDBNames:  'clientsProfilesFilterString' db entry found and moved");

 		db_free(&opt2Dbv);

diff --git a/plugins/MirFox/src/MirfoxData.cpp b/plugins/MirFox/src/MirfoxData.cpp
index c3369ac897..e6bcfb7c31 100644
--- a/plugins/MirFox/src/MirfoxData.cpp
+++ b/plugins/MirFox/src/MirfoxData.cpp
@@ -709,14 +709,14 @@ void MirfoxData::initializeOptions()
 

 	//clientsProfilesFilterString

 	DBVARIANT opt2Dbv = {0};

-	INT_PTR opt2Result = db_get_s(0, PLUGIN_DB_ID, "clientsProfilesFilterString", &opt2Dbv, DBVT_TCHAR);

+	INT_PTR opt2Result = db_get_s(0, PLUGIN_DB_ID, "clientsProfilesFilterString", &opt2Dbv, DBVT_WCHAR);

 	if (opt2Result == 0){	//success

 		//option exists in DB, get value

 		(* getClientsProfilesFilterStringPtr()) = opt2Dbv.pwszVal;

 	} else {

 		//option not exists in DB, set default value

 		(* getClientsProfilesFilterStringPtr()) = L"";

-		db_set_ts(0, PLUGIN_DB_ID, "clientsProfilesFilterString", getClientsProfilesFilterStringPtr()->c_str());

+		db_set_ws(0, PLUGIN_DB_ID, "clientsProfilesFilterString", getClientsProfilesFilterStringPtr()->c_str());

 	}

 	db_free(&opt2Dbv);