Index: src/ch/OptionsDlg.h
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r19b135b50b55b75d008526a799344bda9a62dc22
--- src/ch/OptionsDlg.h	(.../OptionsDlg.h)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/OptionsDlg.h	(.../OptionsDlg.h)	(revision 19b135b50b55b75d008526a799344bda9a62dc22)
@@ -20,9 +20,6 @@
 #define __OPTIONSDLG_H__
 
 #include "PropertyListCtrl.h"
-#include "structs.h"
-#include "shortcuts.h"
-#include "charvect.h"
 
 #define WM_CONFIGNOTIFY		WM_USER+13
 
@@ -31,43 +28,21 @@
 
 class COptionsDlg : public ictranslate::CLanguageDialog
 {
-// Construction
 public:
-	void SendClosingNotify();
-	COptionsDlg(CWnd* pParent = NULL);   // standard constructor
+	explicit COptionsDlg(CWnd* pParent = nullptr);   // standard constructor
 
-	virtual void OnLanguageChanged();
+	void OnLanguageChanged() override;
 
-	static bool m_bLock;				// locker
+	void SendClosingNotify();
 
-	char_vector m_cvRecent;
-	char_vector m_cvShortcuts;
-
-	// for languages
-	vector<ictranslate::CLangData> m_vld;
-	TCHAR m_szLangPath[_MAX_PATH];	// the full path to a folder with langs (@read)
-
 	friend void CustomPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
 	friend void ShortcutsPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
 	friend void RecentPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
 
-// Dialog Data
-	//{{AFX_DATA(COptionsDlg)
-	enum { IDD = IDD_OPTIONS_DIALOG };
-	CPropertyListCtrl	m_ctlProperties;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptionsDlg)
-	public:
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
 protected:
+	void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+
+private:
 	void FillPropertyList();
 	void ApplyProperties();
 
@@ -77,21 +52,25 @@
 	bool GetBoolProp(int iPosition);
 	CString MakeCompoundString(UINT uiBase, int iCount, LPCTSTR lpszSeparator);
 
-	TCHAR m_szBuffer[_MAX_PATH];	// for macro use
-	CString m_strTemp;
-	int m_iSel;
-
 	// Generated message map functions
-	//{{AFX_MSG(COptionsDlg)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
-	virtual void OnCancel();
+	BOOL OnInitDialog() override;
+	void OnOK() override;
+	void OnCancel() override;
 	afx_msg void OnApplyButton();
-	//}}AFX_MSG
+
 	DECLARE_MESSAGE_MAP()
-};
 
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+private:
+	logger::TLoggerPtr m_spLog;
+	static bool m_bLock;				// locker
 
+	std::vector<CString> m_cvRecent;
+	std::vector<CString> m_cvShortcuts;
+
+	// for languages
+	std::vector<ictranslate::CLangData> m_vld;
+
+	CPropertyListCtrl m_ctlProperties;
+};
+
 #endif