From 8c18d1fe6f83807116c065e548ee6b567f4b49a1 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 20 Jan 2019 22:50:52 +0300
Subject: fixes #1776 (any traces of URL* related constants removed)

---
 plugins/Import/src/miranda.cpp | 16 ++--------------
 plugins/Import/src/resource.h  |  3 ---
 plugins/Import/src/stdafx.h    |  3 +--
 3 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'plugins/Import/src')

diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp
index 9dea9f6815..39559cdf4a 100644
--- a/plugins/Import/src/miranda.cpp
+++ b/plugins/Import/src/miranda.cpp
@@ -240,8 +240,8 @@ void CMirandaOptionsPageDlg::OnNext()
 //=======================================================================================
 // Advanced options dialog
 
-static const UINT InControls[] = { IDC_IN_MSG, IDC_IN_URL, IDC_IN_FT, IDC_IN_OTHER };
-static const UINT OutControls[] = { IDC_OUT_MSG, IDC_OUT_URL, IDC_OUT_FT, IDC_OUT_OTHER };
+static const UINT InControls[] = { IDC_IN_MSG, IDC_IN_FT, IDC_IN_OTHER };
+static const UINT OutControls[] = { IDC_OUT_MSG, IDC_OUT_FT, IDC_OUT_OTHER };
 static const UINT SysControls[] = { IDC_CONTACTS, IDC_SYSTEM };
 
 CMirandaAdvOptionsPageDlg::CMirandaAdvOptionsPageDlg() :
@@ -250,7 +250,6 @@ CMirandaAdvOptionsPageDlg::CMirandaAdvOptionsPageDlg() :
 	chkFT(this, IDC_FT),
 	chkAll(this, IDC_ALL),
 	chkMsg(this, IDC_MSG),
-	chkUrl(this, IDC_URL),
 	chkOther(this, IDC_OTHER),
 	chkSince(this, IDC_SINCE),
 	chkOutgoing(this, IDC_OUTGOING),
@@ -261,7 +260,6 @@ CMirandaAdvOptionsPageDlg::CMirandaAdvOptionsPageDlg() :
 	chkSince.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_Since);
 	chkAll.OnChange = chkOutgoing.OnChange = chkIncoming.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_All);
 	chkMsg.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_Msg);
-	chkUrl.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_Url);
 	chkFT.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_FT);
 	chkOther.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_Other);
 }
@@ -297,8 +295,6 @@ void CMirandaAdvOptionsPageDlg::OnNext()
 	// incoming
 	if (IsDlgButtonChecked(m_hwnd, IDC_IN_MSG))
 		g_iImportOptions |= IOPT_MSGRECV;
-	if (IsDlgButtonChecked(m_hwnd, IDC_IN_URL))
-		g_iImportOptions |= IOPT_URLRECV;
 	if (IsDlgButtonChecked(m_hwnd, IDC_IN_FT))
 		g_iImportOptions |= IOPT_FILERECV;
 	if (IsDlgButtonChecked(m_hwnd, IDC_IN_OTHER))
@@ -307,8 +303,6 @@ void CMirandaAdvOptionsPageDlg::OnNext()
 	// outgoing
 	if (IsDlgButtonChecked(m_hwnd, IDC_OUT_MSG))
 		g_iImportOptions |= IOPT_MSGSENT;
-	if (IsDlgButtonChecked(m_hwnd, IDC_OUT_URL))
-		g_iImportOptions |= IOPT_URLSENT;
 	if (IsDlgButtonChecked(m_hwnd, IDC_OUT_FT))
 		g_iImportOptions |= IOPT_FILESENT;
 	if (IsDlgButtonChecked(m_hwnd, IDC_OUT_OTHER))
@@ -363,12 +357,6 @@ void CMirandaAdvOptionsPageDlg::onChange_Msg(CCtrlCheck*)
 	CheckDlgButton(m_hwnd, IDC_OUT_MSG, IsDlgButtonChecked(m_hwnd, IDC_OUT_MSG) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED);
 }
 
-void CMirandaAdvOptionsPageDlg::onChange_Url(CCtrlCheck*)
-{
-	CheckDlgButton(m_hwnd, IDC_IN_URL, IsDlgButtonChecked(m_hwnd, IDC_IN_URL) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(m_hwnd, IDC_OUT_URL, IsDlgButtonChecked(m_hwnd, IDC_OUT_URL) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED);
-}
-
 void CMirandaAdvOptionsPageDlg::onChange_FT(CCtrlCheck*)
 {
 	CheckDlgButton(m_hwnd, IDC_IN_FT, IsDlgButtonChecked(m_hwnd, IDC_IN_FT) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED);
diff --git a/plugins/Import/src/resource.h b/plugins/Import/src/resource.h
index 42ef6867ee..c3d12ea54d 100644
--- a/plugins/Import/src/resource.h
+++ b/plugins/Import/src/resource.h
@@ -40,17 +40,14 @@
 #define IDC_SYSTEM                      1026
 #define IDC_SINCE                       1027
 #define IDC_IN_MSG                      1028
-#define IDC_IN_URL                      1029
 #define IDC_OUT_FT                      1030
 #define IDC_OUT_MSG                     1031
-#define IDC_OUT_URL                     1032
 #define IDC_IN_OTHER                    1033
 #define IDC_OUT_OTHER                   1034
 #define IDC_INCOMING                    1035
 #define IDC_OUTGOING                    1036
 #define IDC_ALL                         1037
 #define IDC_MSG                         1038
-#define IDC_URL                         1039
 #define IDC_FT                          1040
 #define IDC_OPEN_FILE                   1042
 #define IDC_CHECK_DUPS                  1043
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h
index ec5e3cdd7c..415eed700a 100644
--- a/plugins/Import/src/stdafx.h
+++ b/plugins/Import/src/stdafx.h
@@ -162,7 +162,7 @@ public:
 class CMirandaAdvOptionsPageDlg : public CWizardPageDlg
 {
 	CCtrlButton btnBack;
-	CCtrlCheck chkSince, chkAll, chkOutgoing, chkIncoming, chkMsg, chkUrl, chkFT, chkOther;
+	CCtrlCheck chkSince, chkAll, chkOutgoing, chkIncoming, chkMsg, chkFT, chkOther;
 
 public:
 	CMirandaAdvOptionsPageDlg();
@@ -175,7 +175,6 @@ public:
 	void onChange_Since(CCtrlCheck*);
 	void onChange_All(CCtrlCheck*);
 	void onChange_Msg(CCtrlCheck*);
-	void onChange_Url(CCtrlCheck*);
 	void onChange_FT(CCtrlCheck*);
 	void onChange_Other(CCtrlCheck*);
 };
-- 
cgit v1.2.3