From 9983ccb17775804f3985ed0d3c69852c7cad0348 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Sat, 19 Jan 2013 08:40:02 +0000
Subject: - Another portion of _T replacement when it's not needed (from
 person)

git-svn-id: http://svn.miranda-ng.org/main/trunk@3160 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Boltun/src/actionQueue.cpp | 7 +++----
 plugins/Boltun/src/boltun.cpp      | 2 +-
 plugins/Boltun/src/config.cpp      | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'plugins/Boltun')

diff --git a/plugins/Boltun/src/actionQueue.cpp b/plugins/Boltun/src/actionQueue.cpp
index cc9e642600..4da1b56178 100644
--- a/plugins/Boltun/src/actionQueue.cpp
+++ b/plugins/Boltun/src/actionQueue.cpp
@@ -87,9 +87,9 @@ void UpdateTimer()
 
 static bool NotifyTyping(HANDLE hContact)
 {
-	int res = DBGetContactSettingByte(hContact, "SRMsg", "SupportTyping", 2);
+	int res = db_get_b(hContact, "SRMsg", "SupportTyping", 2);
 	if (res == 2)
-		res = DBGetContactSettingByte(NULL, "SRMsg", "DefaultTyping", 1);
+		res = db_get_b(NULL, "SRMsg", "DefaultTyping", 1);
 	return res != 0;
 }
 
@@ -238,8 +238,7 @@ void DoAnswer(HANDLE hContact, const TalkBot::MessageInfo *info, bool sticky = f
 
 void AnswerToContact(HANDLE hContact, const TCHAR* messageToAnswer)
 {
-	if (Config.TalkWarnContacts && DBGetContactSettingByte(hContact, BOLTUN_KEY, 
-		DB_CONTACT_WARNED, FALSE) == FALSE)
+	if (Config.TalkWarnContacts && db_get_b(hContact, BOLTUN_KEY, DB_CONTACT_WARNED, FALSE) == FALSE)
 	{
 		DoAnswer(hContact, new TalkBot::MessageInfo((const TCHAR*)Config.WarnText), true);
 		db_set_b(hContact, BOLTUN_KEY, DB_CONTACT_WARNED, TRUE);
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp
index 9c519fcebd..2248b79d16 100644
--- a/plugins/Boltun/src/boltun.cpp
+++ b/plugins/Boltun/src/boltun.cpp
@@ -470,7 +470,7 @@ static INT_PTR CALLBACK EngineDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
 					if (!bTranslated)
 					{
 						TCHAR* message = new TCHAR[5000];
-						wsprintf(message, TranslateTS(FAILED_TO_LOAD_BASE), line, c);
+						wsprintf(message, FAILED_TO_LOAD_BASE, line, c);
 						MessageBox(NULL, message, BOLTUN_ERROR, MB_ICONERROR|MB_TASKMODAL|MB_OK);
 						delete[] message;
 					}
diff --git a/plugins/Boltun/src/config.cpp b/plugins/Boltun/src/config.cpp
index 2b4e2157e0..2ecce4326e 100644
--- a/plugins/Boltun/src/config.cpp
+++ b/plugins/Boltun/src/config.cpp
@@ -106,7 +106,7 @@ BUILDINTETTERS(AnswerPauseTime, DB_WAIT_TIME, 2);
 BUILDINTETTERS(AnswerThinkTime, DB_THINK_TIME, 4);
 BUILDETTERS(PauseDepends, DB_PAUSE_DEPENDS, TRUE);
 BUILDETTERS(PauseRandom, DB_PAUSE_RANDOM, TRUE);
-BUILDSTRETTERS(WarnText, DB_WARN_TEXT, TranslateTS(DEFAULT_WARN_TEXT));
+BUILDSTRETTERS(WarnText, DB_WARN_TEXT, DEFAULT_WARN_TEXT);
 BUILDSTRETTERS(MindFileName, DB_MIND_FILE_NAME, DEFAULT_MIND_FILE);
 BUILDETTERS(EngineStaySilent, DB_ENGINE_SILENT, FALSE);
 BUILDETTERS(EngineMakeLowerCase, DB_ENGINE_LOWERCASE, FALSE);
-- 
cgit v1.2.3