Index: src/ch/MainWnd.cpp =================================================================== diff -u -N -rc17c4aa7bb4c96219af4191623abe40d18e02713 -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 --- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision c17c4aa7bb4c96219af4191623abe40d18e02713) +++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66) @@ -75,10 +75,6 @@ ///////////////////////////////////////////////////////////////////////////// // CMainWnd construction/destruction CMainWnd::CMainWnd() : - m_pdlgStatus(NULL), - m_pdlgMiniView(NULL), - m_dwLastTime(0), - m_spTasks(), m_spTaskMgrStats(new chcore::TTaskManagerStatsSnapshot) { } Index: src/ch/MainWnd.h =================================================================== diff -u -N -r458af7bf8c35950fdeb4b906950437596324aea1 -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 --- src/ch/MainWnd.h (.../MainWnd.h) (revision 458af7bf8c35950fdeb4b906950437596324aea1) +++ src/ch/MainWnd.h (.../MainWnd.h) (revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66) @@ -82,16 +82,11 @@ chcore::TTaskManagerPtr m_spTasks; chcore::TSharedMemory m_tCHExtharedMemory; - CMiniViewDlg* m_pdlgMiniView; - CStatusDlg* m_pdlgStatus; + CMiniViewDlg* m_pdlgMiniView = nullptr; + CStatusDlg* m_pdlgStatus = nullptr; - DWORD m_dwLastTime; - UINT m_uiTaskbarRestart; + DWORD m_dwLastTime = 0; + UINT m_uiTaskbarRestart = 0; }; -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Developer Studio will insert additional declarations immediately before the previous line. - #endif Index: src/ch/RecentDlg.cpp =================================================================== diff -u -N -r9ea1e103b5fa4ddfebf8028f121ce16e917eec04 -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 --- src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision 9ea1e103b5fa4ddfebf8028f121ce16e917eec04) +++ src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66) @@ -32,11 +32,8 @@ CRecentDlg::CRecentDlg(CWnd* pParent /*=NULL*/) - :ictranslate::CLanguageDialog(CRecentDlg::IDD, pParent) + :ictranslate::CLanguageDialog(IDD_RECENTEDIT_DIALOG, pParent) { - //{{AFX_DATA_INIT(CRecentDlg) - m_strPath = _T(""); - //}}AFX_DATA_INIT } Index: src/ch/RecentDlg.h =================================================================== diff -u -N -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 --- src/ch/RecentDlg.h (.../RecentDlg.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787) +++ src/ch/RecentDlg.h (.../RecentDlg.h) (revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66) @@ -28,41 +28,27 @@ public: explicit CRecentDlg(CWnd* pParent = NULL); // standard constructor -// Dialog Data - //{{AFX_DATA(CRecentDlg) - enum { IDD = IDD_RECENTEDIT_DIALOG }; - CListCtrl m_ctlRecent; - CString m_strPath; - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CRecentDlg) - protected: +protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL -// Implementation -public: - std::vector m_cvRecent; - HIMAGELIST m_himl, m_hliml; - protected: - - // Generated message map functions - //{{AFX_MSG(CRecentDlg) virtual BOOL OnInitDialog(); afx_msg void OnItemchangedRecentList(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnBrowseButton(); afx_msg void OnAddButton(); afx_msg void OnChangeButton(); afx_msg void OnDeleteButton(); - //}}AFX_MSG + DECLARE_MESSAGE_MAP() -}; -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. +public: + std::vector m_cvRecent; +private: + HIMAGELIST m_himl = nullptr; + HIMAGELIST m_hliml = nullptr; + CListCtrl m_ctlRecent; + CString m_strPath; +}; + #endif Index: src/libictranslate/LanguageDialog.cpp =================================================================== diff -u -N -ra13bee8e2ecd1e8f61be0aa9b51d99acdc43a5d0 -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 --- src/libictranslate/LanguageDialog.cpp (.../LanguageDialog.cpp) (revision a13bee8e2ecd1e8f61be0aa9b51d99acdc43a5d0) +++ src/libictranslate/LanguageDialog.cpp (.../LanguageDialog.cpp) (revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66) @@ -28,18 +28,7 @@ ///////////////////////////////////////////////////////////////////////////// // CDlgTemplate ictranslate::CDlgTemplate::CDlgTemplate() : - m_dlgTemplate({ 0 }), - m_wMenu((WORD)-1), - m_pszMenu(NULL), - m_wClass((WORD)-1), - m_pszClass(NULL), - m_wTitle((WORD)-1), - m_pszTitle(NULL), - m_wFontSize(0), - m_wWeight(0), - m_byItalic(0), - m_byCharset(0), - m_pszFace(NULL) + m_dlgTemplate({ 0 }) { } Index: src/libictranslate/LanguageDialog.h =================================================================== diff -u -N -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d -r8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66 --- src/libictranslate/LanguageDialog.h (.../LanguageDialog.h) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d) +++ src/libictranslate/LanguageDialog.h (.../LanguageDialog.h) (revision 8f15ad1d2f65340f4f5a30bc95f40a12b0b7dd66) @@ -114,34 +114,34 @@ { DLGITEMTEMPLATEEX m_itemTemplate; - WORD m_wClass; - TCHAR *m_pszClass; + WORD m_wClass = 0; + TCHAR *m_pszClass = nullptr; - WORD m_wTitle; - TCHAR *m_pszTitle; + WORD m_wTitle = 0; + TCHAR *m_pszTitle = 0; - WORD m_wCreationDataSize; - BYTE *m_pbyCreationData; + WORD m_wCreationDataSize = 0; + BYTE *m_pbyCreationData = nullptr; }; vector<_ITEM> m_vItems; DLGTEMPLATEEX m_dlgTemplate; - WORD m_wMenu; - TCHAR *m_pszMenu; + WORD m_wMenu = (WORD)-1; + TCHAR *m_pszMenu = nullptr; - WORD m_wClass; - TCHAR *m_pszClass; + WORD m_wClass = (WORD)-1; + TCHAR *m_pszClass = nullptr; - WORD m_wTitle; // always -1 - TCHAR *m_pszTitle; + WORD m_wTitle = (WORD)-1; // always -1 + TCHAR *m_pszTitle = nullptr; // font - WORD m_wFontSize; - WORD m_wWeight; - BYTE m_byItalic; - BYTE m_byCharset; - TCHAR *m_pszFace; + WORD m_wFontSize = 0; + WORD m_wWeight = 0; + BYTE m_byItalic = 0; + BYTE m_byCharset = 0; + TCHAR *m_pszFace = nullptr; }; // class stores information about control initial position and offset and scaling factors