From 6468923dbf305d8cdba7ca66b4b921acb8eef460 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 24 Mar 2023 15:57:03 +0300 Subject: make module names identical in all DLLs --- src/core/stdmsg/src/msgoptions.cpp | 4 +- src/core/stdmsg/src/msgs.h | 6 +-- src/core/stdmsg/src/srmm.cpp | 82 +++++++++++++++++++------------------- src/mir_app/src/miranda.h | 2 +- src/mir_app/src/srmm_log.cpp | 2 +- src/mir_app/src/srmm_util.cpp | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 7c3aafb5f9..2a645aee61 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -93,7 +93,7 @@ void RegisterSRMMFonts(void) FontIDW fontid = {}; fontid.flags = FIDF_ALLOWREREGISTER | FIDF_DEFAULTVALID; for (int i = 0; i < _countof(fontOptionsList); i++) { - strncpy_s(fontid.dbSettingsGroup, SRMMMOD, _TRUNCATE); + strncpy_s(fontid.dbSettingsGroup, SRMM_MODULE, _TRUNCATE); wcsncpy_s(fontid.group, LPGENW("Message sessions") L"/" LPGENW("Message log"), _TRUNCATE); wcsncpy_s(fontid.name, fontOptionsList[i].szDescr, _TRUNCATE); @@ -116,7 +116,7 @@ void RegisterSRMMFonts(void) } ColourIDW colourid = {}; - strncpy_s(colourid.dbSettingsGroup, SRMMMOD, _TRUNCATE); + strncpy_s(colourid.dbSettingsGroup, SRMM_MODULE, _TRUNCATE); strncpy_s(colourid.setting, SRMSGSET_BKGCOLOUR, _TRUNCATE); colourid.defcolour = SRMSGDEFSET_BKGCOLOUR; wcsncpy_s(colourid.name, LPGENW("Background"), _TRUNCATE); diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index 080a335328..416db5bf84 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -200,9 +200,9 @@ bool LoadMsgDlgFont(int i, LOGFONT* lf, COLORREF* colour); #define LOADHISTORY_COUNT 1 #define LOADHISTORY_TIME 2 -#define SRMMMOD "SRMM" -#define SRMSGMOD "SRMsg" -#define DBSAVEDMSG "SavedMsg" +#define SRMM_MODULE "SRMM" +#define SRMSGMOD "SRMsg" +#define DBSAVEDMSG "SavedMsg" #define SRMSGSET_TYPING "SupportTyping" diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp index 3e64fc62f6..0731ff17ae 100644 --- a/src/core/stdmsg/src/srmm.cpp +++ b/src/core/stdmsg/src/srmm.cpp @@ -41,47 +41,47 @@ PLUGININFOEX pluginInfoEx = { }; CMPlugin::CMPlugin() : - PLUGIN(SRMMMOD, pluginInfoEx), - - bShowDate(SRMMMOD, "ShowDate", false), - bShowTime(SRMMMOD, "ShowTime", true), - bShowSecs(SRMMMOD, "ShowSeconds", true), - bShowIcons(SRMMMOD, "ShowLogIcon", true), - bShowAvatar(SRMMMOD, "AvatarEnable", true), - bShowButtons(SRMMMOD, "ShowButtonLine", true), - - bTypingNew(SRMMMOD, "DefaultTyping", true), - bTypingUnknown(SRMMMOD, "UnknownTyping", false), - - bShowTyping(SRMMMOD, "ShowTyping", true), - bShowTypingWin(SRMMMOD, "ShowTypingWin", true), - bShowTypingTray(SRMMMOD, "ShowTypingTray", false), - bShowTypingClist(SRMMMOD, "ShowTypingClist", true), - - bCascade(SRMMMOD, "Cascade", true), - bAutoMin(SRMMMOD, "AutoMin", false), - bAutoClose(SRMMMOD, "AutoClose", false), - bShowNames(SRMMMOD, "ShowNames", false), - bShowFormat(SRMMMOD, "ShowFormatting", true), - bSendButton(SRMMMOD, "UseSendButton", false), - bCtrlSupport(SRMMMOD, "SupportCtrlUpDn", true), - bShowReadChar(SRMMMOD, "ShowCharCount", false), - bDeleteTempCont(SRMMMOD, "DeleteTempCont", false), - bSavePerContact(SRMMMOD, "SavePerContact", false), - bDoNotStealFocus(SRMMMOD, "DoNotStealFocus", false), - bUseStatusWinIcon(SRMMMOD, "UseStatusWinIcon", true), - - bLimitAvatarHeight(SRMMMOD, "AvatarLimitHeight", true), - iAvatarHeight(SRMMMOD, "AvatarHeight", 60), - - popupFlags(SRMMMOD, "PopupFlags", 0), - nFlashMax(SRMMMOD, "FlashMax", 5), - - msgTimeout(SRMMMOD, "MessageTimeout", 65000), - - iLoadHistory(SRMMMOD, "LoadHistory", LOADHISTORY_UNREAD), - nLoadCount(SRMMMOD, "LoadCount", 10), - nLoadTime(SRMMMOD, "LoadTime", 10), + PLUGIN(SRMM_MODULE, pluginInfoEx), + + bShowDate(SRMM_MODULE, "ShowDate", false), + bShowTime(SRMM_MODULE, "ShowTime", true), + bShowSecs(SRMM_MODULE, "ShowSeconds", true), + bShowIcons(SRMM_MODULE, "ShowLogIcon", true), + bShowAvatar(SRMM_MODULE, "AvatarEnable", true), + bShowButtons(SRMM_MODULE, "ShowButtonLine", true), + + bTypingNew(SRMM_MODULE, "DefaultTyping", true), + bTypingUnknown(SRMM_MODULE, "UnknownTyping", false), + + bShowTyping(SRMM_MODULE, "ShowTyping", true), + bShowTypingWin(SRMM_MODULE, "ShowTypingWin", true), + bShowTypingTray(SRMM_MODULE, "ShowTypingTray", false), + bShowTypingClist(SRMM_MODULE, "ShowTypingClist", true), + + bCascade(SRMM_MODULE, "Cascade", true), + bAutoMin(SRMM_MODULE, "AutoMin", false), + bAutoClose(SRMM_MODULE, "AutoClose", false), + bShowNames(SRMM_MODULE, "ShowNames", false), + bShowFormat(SRMM_MODULE, "ShowFormatting", true), + bSendButton(SRMM_MODULE, "UseSendButton", false), + bCtrlSupport(SRMM_MODULE, "SupportCtrlUpDn", true), + bShowReadChar(SRMM_MODULE, "ShowCharCount", false), + bDeleteTempCont(SRMM_MODULE, "DeleteTempCont", false), + bSavePerContact(SRMM_MODULE, "SavePerContact", false), + bDoNotStealFocus(SRMM_MODULE, "DoNotStealFocus", false), + bUseStatusWinIcon(SRMM_MODULE, "UseStatusWinIcon", true), + + bLimitAvatarHeight(SRMM_MODULE, "AvatarLimitHeight", true), + iAvatarHeight(SRMM_MODULE, "AvatarHeight", 60), + + popupFlags(SRMM_MODULE, "PopupFlags", 0), + nFlashMax(SRMM_MODULE, "FlashMax", 5), + + msgTimeout(SRMM_MODULE, "MessageTimeout", 65000), + + iLoadHistory(SRMM_MODULE, "LoadHistory", LOADHISTORY_UNREAD), + nLoadCount(SRMM_MODULE, "LoadCount", 10), + nLoadTime(SRMM_MODULE, "LoadTime", 10), // chat options bSoundsFocus(CHAT_MODULE, "SoundsFocus", false), diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h index b2f0605959..5012fdcc65 100644 --- a/src/mir_app/src/miranda.h +++ b/src/mir_app/src/miranda.h @@ -83,7 +83,7 @@ int PopupOptionsInit(WPARAM); /**** srmm.cpp *************************************************************************/ -#define SRMM_MODULE "SRMsg" +#define SRMSGMOD "SRMsg" /**** utf.cpp **************************************************************************/ diff --git a/src/mir_app/src/srmm_log.cpp b/src/mir_app/src/srmm_log.cpp index d60636339d..3821b78b59 100644 --- a/src/mir_app/src/srmm_log.cpp +++ b/src/mir_app/src/srmm_log.cpp @@ -82,7 +82,7 @@ static bool sttEnableCustomLogs(CMsgDialog *pDlg) CSrmmLogWindow* Srmm_GetLogWindow(CMsgDialog *pDlg) { if (sttEnableCustomLogs(pDlg)) { - CMStringA szViewerName(db_get_sm(pDlg->m_hContact, SRMM_MODULE, "Logger")); + CMStringA szViewerName(db_get_sm(pDlg->m_hContact, SRMSGMOD, "Logger")); if (szViewerName.IsEmpty()) szViewerName = db_get_sm(0, "SRMM", "Logger", "built-in"); diff --git a/src/mir_app/src/srmm_util.cpp b/src/mir_app/src/srmm_util.cpp index a6750fd86b..51d4647e62 100644 --- a/src/mir_app/src/srmm_util.cpp +++ b/src/mir_app/src/srmm_util.cpp @@ -91,7 +91,7 @@ MIR_APP_DLL(void) Srmm_CreateHotkey(const char *pszSection, const char *pszDescr g_pszHotkeySection = pszSection; uint16_t wHotKey = HOTKEYCODE(0, VK_RETURN); - if (db_get_b(0, SRMM_MODULE, "SendOnCtrlEnter")) + if (db_get_b(0, SRMSGMOD, "SendOnCtrlEnter")) wHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_RETURN); if (db_get_b(0, "Tab_SRMsg", "sendonshiftenter")) -- cgit v1.2.3