From 085b45f2920353f055b036c00ebb27fb1b8148e9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 19 Jan 2014 12:02:16 +0000
Subject: boolean field names normalization

git-svn-id: http://svn.miranda-ng.org/main/trunk@7753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/chat/tools.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/modules/chat/tools.cpp')

diff --git a/src/modules/chat/tools.cpp b/src/modules/chat/tools.cpp
index e3c43e483d..36e25f3e29 100644
--- a/src/modules/chat/tools.cpp
+++ b/src/modules/chat/tools.cpp
@@ -285,13 +285,13 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
 
 	if (bHighlight) {
 		gce->pDest->iType |= GC_EVENT_HIGHLIGHT;
-		if (bInactive || !g_Settings->SoundsFocus)
+		if (bInactive || !g_Settings->bSoundsFocus)
 			SkinPlaySound("ChatHighlight");
 		if (db_get_b(si->hContact, "CList", "Hidden", 0) != 0)
 			db_unset(si->hContact, "CList", "Hidden");
 		if (bInactive)
 			ci.DoTrayIcon(si, gce);
-		if (bInactive || !g_Settings->PopupInactiveOnly)
+		if (bInactive || !g_Settings->bPopupInactiveOnly)
 			ci.DoPopup(si, gce);
 		if (ci.OnFlashWindow)
 			ci.OnFlashWindow(si, bInactive);
@@ -299,40 +299,40 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
 	}
 
 	// do blinking icons in tray
-	if (bInactive || !g_Settings->TrayIconInactiveOnly)
+	if (bInactive || !g_Settings->bTrayIconInactiveOnly)
 		ci.DoTrayIcon(si, gce);
 
 	// stupid thing to not create multiple popups for a QUIT event for instance
 	if (bManyFix == 0) {
 		// do popups
-		if (bInactive || !g_Settings->PopupInactiveOnly)
+		if (bInactive || !g_Settings->bPopupInactiveOnly)
 			ci.DoPopup(si, gce);
 
 		// do sounds and flashing
 		switch (iEvent) {
 		case GC_EVENT_JOIN:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatJoin");
 			break;
 		case GC_EVENT_PART:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatPart");
 			break;
 		case GC_EVENT_QUIT:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatQuit");
 			break;
 		case GC_EVENT_ADDSTATUS:
 		case GC_EVENT_REMOVESTATUS:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatMode");
 			break;
 		case GC_EVENT_KICK:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatKick");
 			break;
 		case GC_EVENT_MESSAGE:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatMessage");
 
 			if (bInactive && !(si->wState & STATE_TALK)) {
@@ -343,19 +343,19 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
 				ci.OnFlashWindow(si, bInactive);
 			break;
 		case GC_EVENT_ACTION:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatAction");
 			break;
 		case GC_EVENT_NICK:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatNick");
 			break;
 		case GC_EVENT_NOTICE:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatNotice");
 			break;
 		case GC_EVENT_TOPIC:
-			if (bInactive || !g_Settings->SoundsFocus)
+			if (bInactive || !g_Settings->bSoundsFocus)
 				SkinPlaySound("ChatTopic");
 			break;
 		}
@@ -419,7 +419,7 @@ const TCHAR* my_strstri(const TCHAR* s1, const TCHAR* s2)
 
 BOOL IsHighlighted(SESSION_INFO *si, GCEVENT *gce)
 {
-	if (!g_Settings->HighlightEnabled || !g_Settings->pszHighlightWords || !gce || !si || !si->pMe)
+	if (!g_Settings->bHighlightEnabled || !g_Settings->pszHighlightWords || !gce || !si || !si->pMe)
 		return FALSE;
 
 	TCHAR *p1 = g_Settings->pszHighlightWords;
@@ -523,7 +523,7 @@ BOOL LogToFile(SESSION_INFO *si, GCEVENT *gce)
 		if (bFileJustCreated)
 			fputws((const wchar_t*)"\377\376", hFile);		//UTF-16 LE BOM == FF FE
 		if (gce->ptszNick) {
-			if (g_Settings->LogLimitNames && lstrlen(gce->ptszNick) > 20) {
+			if (g_Settings->bLogLimitNames && lstrlen(gce->ptszNick) > 20) {
 				lstrcpyn(szTemp2, gce->ptszNick, 20);
 				lstrcpyn(szTemp2 + 20, _T("..."), 4);
 			}
-- 
cgit v1.2.3