From 64303ec8f7d8fd491247a2c06ee133e4f5f3c942 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 30 Mar 2020 16:52:28 +0300
Subject: Contact lists:

- all common options moved to the Clist namespace;
- fixes #2281 (Add option to not clear "NotOnList" group at start);
---
 include/m_clist.h    |  4 ----
 include/m_clistint.h | 11 +++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/m_clist.h b/include/m_clist.h
index 639b9487a5..11f1449b7a 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -539,15 +539,11 @@ EXTERN_C MIR_APP_DLL(int) Clist_TrayNotifyW(const char *szProto, const wchar_t *
 #define SETTING_ONTOP_DEFAULT         1
 #define SETTING_MIN2TRAY_DEFAULT      1
 #define SETTING_TRAY1CLICK_DEFAULT    (IsWinVer7Plus()?1:0)
-#define SETTING_HIDEOFFLINE_DEFAULT   0
-#define SETTING_HIDEEMPTYGROUPS_DEFAULT  0
-#define SETTING_USEGROUPS_DEFAULT     1
 #define SETTING_SORTBYSTATUS_DEFAULT  0
 #define SETTING_SORTBYPROTO_DEFAULT   0
 #define SETTING_TRANSPARENT_DEFAULT   0
 #define SETTING_ALPHA_DEFAULT         200
 #define SETTING_AUTOALPHA_DEFAULT     150
-#define SETTING_CONFIRMDELETE_DEFAULT 1
 #define SETTING_AUTOHIDE_DEFAULT      0
 #define SETTING_HIDETIME_DEFAULT      30
 #define SETTING_CYCLETIME_DEFAULT     4
diff --git a/include/m_clistint.h b/include/m_clistint.h
index a547640439..7135d8eebe 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system.h>
 #include <m_protocols.h>
 #include <m_clc.h>
+#include <m_gui.h>
 
 #define HCONTACT_ISGROUP    0x80000000
 #define HCONTACT_ISINFO     0xFFFF0000
@@ -442,4 +443,14 @@ EXTERN_C MIR_APP_DLL(CLIST_INTERFACE*) Clist_GetInterface(void);
 
 extern MIR_APP_EXPORT CLIST_INTERFACE g_clistApi;
 
+namespace Clist
+{
+	extern MIR_APP_EXPORT CMOption<bool> 
+		HideOffline,
+		UseGroups,
+		HideEmptyGroups, 
+		ConfirmDelete, 
+		RemoveTempContacts;
+};
+
 #endif // M_CLISTINT_H__
-- 
cgit v1.2.3