Index: src/ch/shortcutsdlg.h
===================================================================
diff -u -r449a5b399ab21ca0d06050b47b264f2f704af966 -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/ch/shortcutsdlg.h	(.../shortcutsdlg.h)	(revision 449a5b399ab21ca0d06050b47b264f2f704af966)
+++ src/ch/shortcutsdlg.h	(.../shortcutsdlg.h)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -19,45 +19,23 @@
 #ifndef __SHORTCUTSDLG_H__
 #define __SHORTCUTSDLG_H__
 
-#include "charvect.h"
-
 /////////////////////////////////////////////////////////////////////////////
 // CShortcutsDlg dialog
 
 class CShortcutsDlg : public ictranslate::CLanguageDialog
 {
 // Construction
 public:
-	CShortcutsDlg(CWnd* pParent = NULL);   // standard constructor
+	explicit CShortcutsDlg(CWnd* pParent = nullptr);   // standard constructor
 
-// Dialog Data
-	//{{AFX_DATA(CShortcutsDlg)
-	enum { IDD = IDD_SHORTCUTEDIT_DIALOG };
-	CComboBoxEx	m_ctlPath;
-	CListCtrl	m_ctlShortcuts;
-	CString	m_strName;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CShortcutsDlg)
-	protected:
+protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
 
-// Implementation
-public:
-	const char_vector *m_pcvRecent;	// one way only
-	char_vector m_cvShortcuts;		// two-way - shortcuts are being returned through this member
 protected:
 	void UpdateComboIcon();
 	void SetComboPath(LPCTSTR lpszPath);
-	HIMAGELIST m_himl, m_hliml;
-	bool m_bActualisation;
 
 	// Generated message map functions
-	//{{AFX_MSG(CShortcutsDlg)
 	virtual BOOL OnInitDialog();
 	afx_msg void OnItemchangedShortcutList(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnEditchangePathComboboxex();
@@ -67,11 +45,20 @@
 	afx_msg void OnBrowseButton();
 	afx_msg void OnUpButton();
 	afx_msg void OnDownButton();
-	//}}AFX_MSG
+
 	DECLARE_MESSAGE_MAP()
-};
 
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+public:
+	const std::vector<CString> *m_pcvRecent = nullptr;	// one way only
+	std::vector<CString> m_cvShortcuts;		// two-way - shortcuts are being returned through this member
 
+private:
+	HIMAGELIST m_himl = nullptr;
+	HIMAGELIST m_hliml = nullptr;
+	bool m_bActualisation = false;
+	CComboBoxEx	m_ctlPath;
+	CListCtrl	m_ctlShortcuts;
+	CString	m_strName;
+};
+
 #endif