From 53452cdfd0f64b78eb91d80f2a266ecdcc4953c0 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 26 Oct 2023 15:26:46 +0300
Subject: code simplification + cleaning

---
 protocols/Facebook/src/proto.cpp     | 2 +-
 protocols/Facebook/src/server.cpp    | 2 +-
 protocols/ICQ-WIM/src/proto.cpp      | 2 +-
 protocols/ICQ-WIM/src/server.cpp     | 2 +-
 protocols/Telegram/src/avatars.cpp   | 2 +-
 protocols/Telegram/src/proto.cpp     | 2 +-
 protocols/VKontakte/src/misc.cpp     | 2 +-
 protocols/VKontakte/src/vk_proto.cpp | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Facebook/src/proto.cpp b/protocols/Facebook/src/proto.cpp
index 5e896c6f4e..6f3209fe02 100644
--- a/protocols/Facebook/src/proto.cpp
+++ b/protocols/Facebook/src/proto.cpp
@@ -137,7 +137,7 @@ void FacebookProto::OnModulesLoaded()
 	VARSW wszCache(L"%miranda_avatarcache%");
 
 	CMStringW wszPath(FORMAT, L"%s\\%S\\Stickers\\*.png", wszCache.get(), m_szModuleName);
-	SMADD_CONT cont = { 2, m_szModuleName, wszPath };
+	SMADD_CONT cont = { SMADD_FOLDER, m_szModuleName, wszPath };
 	CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 
 	wszPath.Format(L"%s\\%S\\Stickers\\*.webp", wszCache.get(), m_szModuleName);
diff --git a/protocols/Facebook/src/server.cpp b/protocols/Facebook/src/server.cpp
index b2f424a0e0..482db30bd7 100644
--- a/protocols/Facebook/src/server.cpp
+++ b/protocols/Facebook/src/server.cpp
@@ -783,7 +783,7 @@ void FacebookProto::OnPublishPrivateMessage(const JSONNode &root)
 					szBody += "\r\n";
 				szBody += "STK{" + stickerId + "}";
 
-				SMADD_CONT cont = { 1, m_szModuleName, wszFileName };
+				SMADD_CONT cont = { SMADD_FILE, m_szModuleName, wszFileName };
 				CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 			}
 			else szBody += TranslateU("Sticker received");
diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index 0eeab208f5..0633783f9d 100644
--- a/protocols/ICQ-WIM/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
@@ -139,7 +139,7 @@ void CIcqProto::OnModulesLoaded()
 
 	// load custom smilies
 	CMStringW wszPath(GetAvatarPath() + L"\\Stickers\\*.png");
-	SMADD_CONT cont = { 2, m_szModuleName, wszPath };
+	SMADD_CONT cont = { SMADD_FOLDER, m_szModuleName, wszPath };
 	CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 }
 
diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp
index 15064b4408..853e9ccde7 100644
--- a/protocols/ICQ-WIM/src/server.cpp
+++ b/protocols/ICQ-WIM/src/server.cpp
@@ -1010,7 +1010,7 @@ void CIcqProto::OnGetSticker(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pReq)
 	fwrite(pReply->pData, 1, pReply->dataLength, out);
 	fclose(out);
 
-	SMADD_CONT cont = { 1, m_szModuleName, wszFileName };
+	SMADD_CONT cont = { SMADD_FILE, m_szModuleName, wszFileName };
 	CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 }
 
diff --git a/protocols/Telegram/src/avatars.cpp b/protocols/Telegram/src/avatars.cpp
index 143692f8a2..11646a681d 100644
--- a/protocols/Telegram/src/avatars.cpp
+++ b/protocols/Telegram/src/avatars.cpp
@@ -193,7 +193,7 @@ void CTelegramProto::ProcessFile(TD::updateFile *pObj)
 				}
 				else MoveFileW(wszExistingFile, wszFullName);
 					
-				SMADD_CONT cont = { 1, m_szModuleName, wszFullName };
+				SMADD_CONT cont = { SMADD_FILE, m_szModuleName, wszFullName };
 				CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 
 				mir_cslock lck(m_csFiles);
diff --git a/protocols/Telegram/src/proto.cpp b/protocols/Telegram/src/proto.cpp
index 4f62a300a0..61ecf9c132 100644
--- a/protocols/Telegram/src/proto.cpp
+++ b/protocols/Telegram/src/proto.cpp
@@ -153,7 +153,7 @@ void CTelegramProto::OnModulesLoaded()
 	m_bSmileyAdd = ServiceExists(MS_SMILEYADD_LOADCONTACTSMILEYS);
 	if (m_bSmileyAdd) {
 		CMStringW wszStickersPath(GetAvatarPath() + L"\\Stickers\\*.*");
-		SMADD_CONT cont = {2, m_szModuleName, wszStickersPath};
+		SMADD_CONT cont = { SMADD_FOLDER, m_szModuleName, wszStickersPath };
 		CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 	}
 }
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 6cd5957735..73ae348edc 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -1467,7 +1467,7 @@ CMStringW CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport
 					if (bSuccess) {
 						res.AppendFormat(L"[sticker-%d]",  iStickerId);
 
-						SMADD_CONT cont = { 1, m_szModuleName, wszFileName };
+						SMADD_CONT cont = { SMADD_FILE, m_szModuleName, wszFileName };
 						CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 					}
 					else res += SetBBCString(TranslateT("Sticker"), iBBC, vkbbcUrl, wszUrl);
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 6af4cfd606..4c6b79951a 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -128,7 +128,7 @@ void CVkProto::InitSmileys()
 		return;
 
 	CMStringW wszPath(FORMAT, L"%s\\%S\\Stickers\\*.png", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
-	SMADD_CONT cont = { 2, m_szModuleName, wszPath };
+	SMADD_CONT cont = { SMADD_FOLDER, m_szModuleName, wszPath };
 	CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
 }
 
-- 
cgit v1.2.3