From ac53fb61905a0bfd2e63afd00823eed4741fa5c5 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 1 May 2020 14:52:45 +0300
Subject: FIDF_DEFAULTVALID: code cleaning

---
 plugins/NewStory/src/fonts.cpp     |  5 +++--
 plugins/Scriver/src/msgoptions.cpp |  2 +-
 plugins/TipperYM/src/tipper.cpp    | 16 ++++------------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/plugins/NewStory/src/fonts.cpp b/plugins/NewStory/src/fonts.cpp
index de13764082..12f0351721 100644
--- a/plugins/NewStory/src/fonts.cpp
+++ b/plugins/NewStory/src/fonts.cpp
@@ -19,8 +19,8 @@ MyColourID g_colorTable[COLOR_COUNT] =
 
 MyFontID g_fontTable[FONT_COUNT] =
 {
-	{ "Incoming nick",     "FontNickIn", RGB(0xc8, 0x3f, 0x6b)    },
-	{ "Outgoing nick",     "FontNickOut", RGB(0x08, 0x60, 0xbd)  },
+	{ "Incoming nick",         "FontNickIn",   RGB(0xc8, 0x3f, 0x6b) },
+	{ "Outgoing nick",         "FontNickOut",  RGB(0x08, 0x60, 0xbd) },
 
 	{ "Incoming messages",     "FontMsgIn"   },
 	{ "Outgoing messages",     "FontMsgOut"  },
@@ -71,6 +71,7 @@ void InitFonts()
 	}
 
 	FontID fontid = {};
+	fontid.flags = FIDF_DEFAULTVALID;
 	strncpy_s(fontid.group, MODULENAME, _TRUNCATE);
 	strncpy_s(fontid.dbSettingsGroup, MODULENAME, _TRUNCATE);
 
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 21b26e0de2..ee98aabe7a 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -85,7 +85,7 @@ void RegisterFontServiceFonts()
 	wcsncpy_s(fid.group, LPGENW("Messaging"), _TRUNCATE);
 	wcsncpy_s(fid.backgroundGroup, LPGENW("Messaging"), _TRUNCATE);
 	strncpy(fid.dbSettingsGroup, SRMM_MODULE, _countof(fid.dbSettingsGroup));
-	fid.flags = FIDF_DEFAULTVALID | FIDF_DEFAULTVALID;
+	fid.flags = FIDF_DEFAULTVALID;
 	for (int i = 0; i < _countof(fontOptionsList); i++) {
 		fid.order = i;
 
diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp
index 82bb2875c5..eb81f2f938 100644
--- a/plugins/TipperYM/src/tipper.cpp
+++ b/plugins/TipperYM/src/tipper.cpp
@@ -155,7 +155,7 @@ static void InitFonts()
 	colourSidebar.order = 0;
 	g_plugin.addColor(&colourSidebar);
 
-	fontTitle.flags = FIDF_ALLOWEFFECTS;
+	fontTitle.flags = FIDF_ALLOWEFFECTS | FIDF_DEFAULTVALID;
 	mir_wstrcpy(fontTitle.group, LPGENW("Tooltips"));
 	mir_wstrcpy(fontTitle.name, LPGENW("Title"));
 	mir_strcpy(fontTitle.dbSettingsGroup, MODULENAME);
@@ -163,14 +163,12 @@ static void InitFonts()
 	mir_wstrcpy(fontTitle.backgroundGroup, LPGENW("Tooltips"));
 	mir_wstrcpy(fontTitle.backgroundName, LPGENW("Background"));
 	fontTitle.order = 0;
-
 	fontTitle.deffontsettings.charset = DEFAULT_CHARSET;
 	fontTitle.deffontsettings.size = -14;
 	fontTitle.deffontsettings.style = DBFONTF_BOLD;
 	fontTitle.deffontsettings.colour = RGB(255, 0, 0);
-	fontTitle.flags |= FIDF_DEFAULTVALID;
 
-	fontLabels.flags = FIDF_ALLOWEFFECTS;
+	fontLabels.flags = FIDF_ALLOWEFFECTS | FIDF_DEFAULTVALID;
 	mir_wstrcpy(fontLabels.group, LPGENW("Tooltips"));
 	mir_wstrcpy(fontLabels.name, LPGENW("Labels"));
 	mir_strcpy(fontLabels.dbSettingsGroup, MODULENAME);
@@ -178,14 +176,12 @@ static void InitFonts()
 	mir_wstrcpy(fontLabels.backgroundGroup, LPGENW("Tooltips"));
 	mir_wstrcpy(fontLabels.backgroundName, LPGENW("Background"));
 	fontLabels.order = 1;
-
 	fontLabels.deffontsettings.charset = DEFAULT_CHARSET;
 	fontLabels.deffontsettings.size = -12;
 	fontLabels.deffontsettings.style = DBFONTF_ITALIC;
 	fontLabels.deffontsettings.colour = RGB(128, 128, 128);
-	fontLabels.flags |= FIDF_DEFAULTVALID;
 
-	fontValues.flags = FIDF_ALLOWEFFECTS;
+	fontValues.flags = FIDF_ALLOWEFFECTS | FIDF_DEFAULTVALID;
 	mir_wstrcpy(fontValues.group, LPGENW("Tooltips"));
 	mir_wstrcpy(fontValues.name, LPGENW("Values"));
 	mir_strcpy(fontValues.dbSettingsGroup, MODULENAME);
@@ -193,14 +189,12 @@ static void InitFonts()
 	mir_wstrcpy(fontValues.backgroundGroup, LPGENW("Tooltips"));
 	mir_wstrcpy(fontValues.backgroundName, LPGENW("Background"));
 	fontValues.order = 2;
-
 	fontValues.deffontsettings.charset = DEFAULT_CHARSET;
 	fontValues.deffontsettings.size = -12;
 	fontValues.deffontsettings.style = 0;
 	fontValues.deffontsettings.colour = RGB(0, 0, 0);
-	fontValues.flags |= FIDF_DEFAULTVALID;
 
-	fontTrayTitle.flags = FIDF_ALLOWEFFECTS;
+	fontTrayTitle.flags = FIDF_ALLOWEFFECTS | FIDF_DEFAULTVALID;
 	mir_wstrcpy(fontTrayTitle.group, LPGENW("Tooltips"));
 	mir_wstrcpy(fontTrayTitle.name, LPGENW("Tray title"));
 	mir_strcpy(fontTrayTitle.dbSettingsGroup, MODULENAME);
@@ -208,12 +202,10 @@ static void InitFonts()
 	mir_wstrcpy(fontTrayTitle.backgroundGroup, LPGENW("Tooltips"));
 	mir_wstrcpy(fontTrayTitle.backgroundName, LPGENW("Background"));
 	fontTrayTitle.order = 0;
-
 	fontTrayTitle.deffontsettings.charset = DEFAULT_CHARSET;
 	fontTrayTitle.deffontsettings.size = -14;
 	fontTrayTitle.deffontsettings.style = DBFONTF_BOLD;
 	fontTrayTitle.deffontsettings.colour = RGB(0, 0, 0);
-	fontTrayTitle.flags |= FIDF_DEFAULTVALID;
 
 	g_plugin.addFont(&fontTitle);
 	g_plugin.addFont(&fontLabels);
-- 
cgit v1.2.3