no more TCHARs

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

4 files changed, 11 insertions, 11 deletions

diff --git a/plugins/ClientChangeNotify/src/CString.cpp b/plugins/ClientChangeNotify/src/CString.cpp
index 4f4064d60a..edee2fe0e6 100644
--- a/plugins/ClientChangeNotify/src/CString.cpp
+++ b/plugins/ClientChangeNotify/src/CString.cpp
@@ -280,7 +280,7 @@ CString db_get_s(MCONTACT hContact, const char *szModule, const char *szSetting,
 

 TCString db_get_s(MCONTACT hContact, const char *szModule, const char *szSetting, const wchar_t *szDefaultValue)

 {

-	ptrW p( db_get_tsa(hContact, szModule, szSetting));

+	ptrW p( db_get_wsa(hContact, szModule, szSetting));

 	return TCString(p == NULL ? szDefaultValue : p);

 }

 

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index f70270d757..67f13a01a7 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -203,7 +203,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 			return 0;

 	}

 	sd.OldMirVer = db_get_s(hContact, MOD_NAME, DB_OLDMIRVER, L"");

-	db_set_ts(hContact, MOD_NAME, DB_OLDMIRVER, sd.MirVer); // we have to write it here, because we modify sd.OldMirVer and sd.MirVer to conform our settings later

+	db_set_ws(hContact, MOD_NAME, DB_OLDMIRVER, sd.MirVer); // we have to write it here, because we modify sd.OldMirVer and sd.MirVer to conform our settings later

 	if (sd.OldMirVer.IsEmpty())  // looks like it's the right way to do

 		return 0;

 

@@ -331,7 +331,7 @@ int MirandaLoaded(WPARAM, LPARAM)
 		CMenuItem mi;

 		SET_UID(mi, 0xfabb9181, 0xdb92, 0x43f4, 0x86, 0x40, 0xca, 0xb6, 0x4c, 0x93, 0x34, 0x27);

 		mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Popups"), 0);

-		mi.flags = CMIF_TCHAR;

+		mi.flags = CMIF_UNICODE;

 		if (g_PopupOptPage.GetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY))

 			mi.name.w = LPGENW("Disable c&lient change notification");

 		else

@@ -361,7 +361,7 @@ extern "C" int __declspec(dllexport) Load(void)
 		TCString Str;

 		Str = db_get_s(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, L"");

 		if (Str.GetLen()) // fix incorrect regexp from v0.1.1.0

-			db_set_ts(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, Str.Replace(L"/Miranda[0-9A-F]{8}/", L"/[0-9A-F]{8}(\\W|$)/"));

+			db_set_ws(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, Str.Replace(L"/Miranda[0-9A-F]{8}/", L"/[0-9A-F]{8}(\\W|$)/"));

 

 		db_set_b(NULL, MOD_NAME, DB_SETTINGSVER, 1);

 	}

diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp
index 9ec69fe61c..ffc13577d3 100644
--- a/plugins/ClientChangeNotify/src/OptDlg.cpp
+++ b/plugins/ClientChangeNotify/src/OptDlg.cpp
@@ -87,8 +87,8 @@ INT_PTR CALLBACK PopupOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			HWND hLCombo = GetDlgItem(hwndDlg, IDC_POPUPOPTDLG_LCLICK_ACTION);

 			HWND hRCombo = GetDlgItem(hwndDlg, IDC_POPUPOPTDLG_RCLICK_ACTION);

 			for (int i = 0; i < _countof(PopupActions); i++) {

-				SendMessage(hLCombo, CB_SETITEMDATA, SendMessage(hLCombo, CB_ADDSTRING, 0, (LPARAM)TranslateTS(PopupActions[i].Text)), PopupActions[i].Action);

-				SendMessage(hRCombo, CB_SETITEMDATA, SendMessage(hRCombo, CB_ADDSTRING, 0, (LPARAM)TranslateTS(PopupActions[i].Text)), PopupActions[i].Action);

+				SendMessage(hLCombo, CB_SETITEMDATA, SendMessage(hLCombo, CB_ADDSTRING, 0, (LPARAM)TranslateW(PopupActions[i].Text)), PopupActions[i].Action);

+				SendMessage(hRCombo, CB_SETITEMDATA, SendMessage(hRCombo, CB_ADDSTRING, 0, (LPARAM)TranslateW(PopupActions[i].Text)), PopupActions[i].Action);

 			}

 			g_PopupOptPage.DBToMemToPage();

 			EnablePopupOptDlgControls();

@@ -168,7 +168,7 @@ int OptionsDlgInit(WPARAM wParam, LPARAM)
 		optDi.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPOPTDLG);

 		optDi.hInstance = g_hInstance;

 		optDi.pwszGroup = LPGENW("Popups");

-		optDi.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

+		optDi.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;

 		Options_AddPage(wParam, &optDi);

 	}

 	return 0;

diff --git a/plugins/ClientChangeNotify/src/Options.cpp b/plugins/ClientChangeNotify/src/Options.cpp
index 62463ea611..0a81d2f701 100644
--- a/plugins/ClientChangeNotify/src/Options.cpp
+++ b/plugins/ClientChangeNotify/src/Options.cpp
@@ -151,7 +151,7 @@ TCString COptItem::GetStrDBVal(const CString &sModule, CString *sDBSettingPrefix
 void COptItem::SetStrDBVal(const CString &sModule, TCString &Str, CString *sDBSettingPrefix)

 {

 	if (sDBSetting != NULL && !m_bReadOnly) {

-		db_set_ts(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, Str);

+		db_set_ws(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, Str);

 	}

 }

 

@@ -331,7 +331,7 @@ void COptItem_TreeCtrl::MemToDB(const CString &sModule, CString *sDBSettingPrefi
 			CString StrID;

 			_itoa(m_value[i].ID, StrID.GetBuffer(64), 10);

 			StrID.ReleaseBuffer();

-			db_set_ts(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, m_value[i].Title);

+			db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, m_value[i].Title);

 			if (!(TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL))

 				db_set_w(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_PARENT + StrID, m_value[i].ParentID);

 

@@ -340,7 +340,7 @@ void COptItem_TreeCtrl::MemToDB(const CString &sModule, CString *sDBSettingPrefi
 				db_set_b(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, m_value[i].Flags);

 

 			if (User_Str1_DBName != NULL && m_value[i].User_Str1 != NULL)

-				db_set_ts(NULL, sModule, *sDBSettingPrefix + sDBSetting + User_Str1_DBName + StrID, m_value[i].User_Str1);

+				db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + User_Str1_DBName + StrID, m_value[i].User_Str1);

 		}

 		COptItem::MemToDB(sModule, sDBSettingPrefix);

 	}

@@ -703,7 +703,7 @@ void COptItem_ListCtrl::MemToDB(const CString &sModule, CString *sDBSettingPrefi
 			CString StrID;

 			_itoa(i, StrID.GetBuffer(64), 10);

 			StrID.ReleaseBuffer();

-			db_set_ts(NULL, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, m_value[i].Text);

+			db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, m_value[i].Text);

 		}

 		COptItem::MemToDB(sModule, sDBSettingPrefix);

 	}