From 02c1b09093d598f9da00409d903309440603852f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 2 Jul 2024 15:30:16 +0300
Subject: UInfoEx: unused macro EXIM_GROUP removed

---
 plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 2 --
 plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp     | 1 -
 plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp    | 8 +++-----
 plugins/UserInfoEx/src/ex_import/svc_ExImport.h      | 5 ++---
 4 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'plugins/UserInfoEx')

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index 8fba18e0b7..4a5e779cee 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
@@ -191,7 +191,6 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar
 					newTitle[MAXDATASIZE];
 				switch (pDat->ExImContact->Typ) {
 				case EXIM_ALL:
-				case EXIM_GROUP:
 					name = TranslateT("All Contacts");
 					break;
 				case EXIM_CONTACT:
@@ -279,7 +278,6 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar
 											// Filter by mode
 											switch (pDat->ExImContact->Typ) {
 											case EXIM_ALL:
-											case EXIM_GROUP:
 												break;
 											case EXIM_SUBGROUP:
 												if (mir_wstrncmp(pDat->ExImContact->ptszName, DB::Setting::GetWString(hContact, "CList", "Group"), mir_wstrlen(pDat->ExImContact->ptszName))) {
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index 366ab181db..4ff852670c 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -140,7 +140,6 @@ int CFileXml::Export(lpExImParam ExImContact, const wchar_t *pszFileName)
 			for (auto &hContact: Contacts()) {
 				switch (ExImContact->Typ) {
 				case EXIM_ALL:
-				case EXIM_GROUP:
 					// dont export meta subcontacts by default
 					if (!db_mc_isSub(hContact)) {
 						if (vContact.fromDB(hContact)) {
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index abfd58e804..1d321c7f1b 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -44,7 +44,6 @@ static void DisplayNameToFileName(lpExImParam ExImContact, wchar_t *pszFileName,
 
 	switch (ExImContact->Typ) {
 	case EXIM_ALL:
-	case EXIM_GROUP:
 		mir_wstrncpy(pszFileName, TranslateT("all Contacts"), cchFileName);
 		return;
 
@@ -98,7 +97,6 @@ static CMStringW FilterString(lpExImParam ExImContact)
 		__fallthrough;
 
 	case EXIM_ALL:
-	case EXIM_GROUP:
 		str.AppendFormat(L"%s (*.ini)\0*.ini\0", TranslateT("DBEditor++ File"));
 		__fallthrough;
 
@@ -157,7 +155,7 @@ INT_PTR SvcExImport_Export(lpExImParam ExImContact, HWND hwndParent)
 INT_PTR SvcExImport_Import(lpExImParam ExImContact, HWND hwndParent)
 {
 	// Still under development
-	if (ExImContact->Typ == EXIM_ACCOUNT || ExImContact->Typ == EXIM_GROUP)
+	if (ExImContact->Typ == EXIM_ACCOUNT || ExImContact->Typ == EXIM_SUBGROUP)
 		return 1;
 
 	wchar_t szFileName[MAX_PATH]; szFileName[0] = 0;
@@ -258,8 +256,8 @@ INT_PTR svcExportGroup(WPARAM wParam, LPARAM)
 	auto *grp = (ClcGroup *)wParam;
 
 	ExImParam ExIm;
-	ExIm.ptszName = Clist_GroupGetName(grp->groupId);
 	ExIm.Typ = EXIM_SUBGROUP;
+	ExIm.ptszName = Clist_GroupGetName(grp->groupId);
 	SvcExImport_Export(&ExIm, g_clistApi.hwndContactTree);
 	return 0;
 };
@@ -270,8 +268,8 @@ INT_PTR svcImportGroup(WPARAM wParam, LPARAM)
 	auto *grp = (ClcGroup *)wParam;
 
 	ExImParam ExIm;
-	ExIm.ptszName = Clist_GroupGetName(grp->groupId);
 	ExIm.Typ = EXIM_SUBGROUP;
+	ExIm.ptszName = Clist_GroupGetName(grp->groupId);
 	SvcExImport_Import(&ExIm, g_clistApi.hwndContactTree);
 	return 0;
 };
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.h b/plugins/UserInfoEx/src/ex_import/svc_ExImport.h
index c484336610..52e7850cec 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.h
@@ -37,9 +37,8 @@ enum ExImType
 {
 	EXIM_ALL = 1,
 	EXIM_CONTACT = 2,
-	EXIM_GROUP = 4,
-	EXIM_SUBGROUP = 8,
-	EXIM_ACCOUNT = 16
+	EXIM_SUBGROUP = 4,
+	EXIM_ACCOUNT = 8
 };
 
 INT_PTR svcExportContact(WPARAM wParam, LPARAM lParam);
-- 
cgit v1.2.3