From d5c6af21d737670e4abbdb6521e5c8e3d074fee8 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 10 Apr 2025 18:10:57 +0300
Subject: code cleaning

---
 protocols/Discord/src/menus.cpp | 10 +++++-----
 protocols/Discord/src/proto.cpp |  2 +-
 protocols/Discord/src/stdafx.h  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/protocols/Discord/src/menus.cpp b/protocols/Discord/src/menus.cpp
index 6386d32a4a..dca1a3daa6 100644
--- a/protocols/Discord/src/menus.cpp
+++ b/protocols/Discord/src/menus.cpp
@@ -156,7 +156,7 @@ void CDiscordProto::OnBuildProtoMenu()
 void CDiscordProto::InitMenus()
 {
 	CMenuItem mi(&g_plugin);
-	mi.pszService = "/Discord/LeaveGuild";
+	mi.pszService = MODULENAME "/LeaveGuild";
 	CreateServiceFunction(mi.pszService, GlobalService<&CDiscordProto::OnMenuLeaveGuild>);
 	SET_UID(mi, 0x6EF11AD6, 0x6111, 0x4E29, 0xBA, 0x8B, 0xA7, 0xB2, 0xE0, 0x22, 0xE1, 0x8C);
 	mi.name.a = LPGEN("Leave guild");
@@ -164,7 +164,7 @@ void CDiscordProto::InitMenus()
 	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_CHAT_LEAVE);
 	g_hMenuLeaveGuild = Menu_AddContactMenuItem(&mi);
 
-	mi.pszService = "/Discord/CreateChannel";
+	mi.pszService = MODULENAME "/CreateChannel";
 	CreateServiceFunction(mi.pszService, GlobalService<&CDiscordProto::OnMenuCreateChannel>);
 	SET_UID(mi, 0x6EF11AD6, 0x6111, 0x4E29, 0xBA, 0x8B, 0xA7, 0xB2, 0xE0, 0x22, 0xE1, 0x8D);
 	mi.name.a = LPGEN("Create new channel");
@@ -174,13 +174,13 @@ void CDiscordProto::InitMenus()
 
 	SET_UID(mi, 0x6EF11AD6, 0x6111, 0x4E29, 0xBA, 0x8B, 0xA7, 0xB2, 0xE0, 0x22, 0xE1, 0x8E);
 	CreateServiceFunction(mi.pszService, GlobalService<&CDiscordProto::OnMenuCopyId>);
-	mi.pszService = "/Discord/CopyId";
+	mi.pszService = MODULENAME "/CopyId";
 	mi.name.a = LPGEN("Copy ID");
 	mi.position++;
 	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERONLINE);
 	Menu_AddContactMenuItem(&mi);
 
-	mi.pszService = "/Discord/ToggleSync";
+	mi.pszService = MODULENAME "/ToggleSync";
 	CreateServiceFunction(mi.pszService, GlobalService<&CDiscordProto::OnMenuToggleSync>);
 	SET_UID(mi, 0x6EF11AD6, 0x6111, 0x4E29, 0xBA, 0x8B, 0xA7, 0xB2, 0xE0, 0x22, 0xE1, 0x8F);
 	mi.name.a = LPGEN("Enable guild sync");
@@ -188,7 +188,7 @@ void CDiscordProto::InitMenus()
 	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);
 	g_hMenuToggleSync = Menu_AddContactMenuItem(&mi);
 
-	mi.pszService = "/Discord/DatabaseHistory";
+	mi.pszService = MODULENAME "/DatabaseHistory";
 	CreateServiceFunction(mi.pszService, GlobalService<&CDiscordProto::OnMenuDatabaseHistory>);
 	SET_UID(mi, 0x6EF11AD6, 0x6111, 0x4E29, 0xBA, 0x8B, 0xA7, 0xB2, 0xE0, 0x22, 0xE1, 0x90);
 	mi.name.a = LPGEN("Enable database history for a guild");
diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index f60174d9a7..5544570548 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -55,7 +55,7 @@ CDiscordProto::CDiscordProto(const char *proto_name, const wchar_t *username) :
 	arVoiceCalls(1, compareCalls),
 
 	m_wszEmail(this, "Email", L""),
-	m_wszDefaultGroup(this, "GroupName", DB_KEYVAL_GROUP),
+	m_wszDefaultGroup(this, "GroupName", L"Discord"),
 	m_bSyncMarkRead(this, "SendMarkRead", true),
 	m_bUseGroupchats(this, "UseGroupChats", true),
 	m_bHideGroupchats(this, "HideChats", true),
diff --git a/protocols/Discord/src/stdafx.h b/protocols/Discord/src/stdafx.h
index b29b751fb7..646cb3f4e0 100644
--- a/protocols/Discord/src/stdafx.h
+++ b/protocols/Discord/src/stdafx.h
@@ -74,7 +74,7 @@ extern HGENMENU g_hMenuLeaveGuild, g_hMenuCreateChannel, g_hMenuToggleSync, g_hM
 #define DB_KEY_ENABLE_SYNC "EnableSync"
 #define DB_KEY_ENABLE_HIST "EnableDbHistory"
 
-#define DB_KEYVAL_GROUP L"Discord"
+#define MODULENAME         "Discord"
 
 #include "version.h"
 #include "proto.h"
-- 
cgit v1.2.3