Index: src/ch/AboutDlg.h =================================================================== diff -u -r4fe995b304ea342b50293f92d3c1992b43b820f7 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/AboutDlg.h (.../AboutDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/ch/AboutDlg.h (.../AboutDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -28,15 +28,15 @@ void UpdateProgramVersion(); - virtual void OnLanguageChanged(); - virtual BOOL OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip); + void OnLanguageChanged() override; + BOOL OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip) override; protected: static bool m_bLock; // locker // Implementation protected: - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; DECLARE_MESSAGE_MAP() }; Index: src/ch/BufferSizeDlg.h =================================================================== diff -u -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/BufferSizeDlg.h (.../BufferSizeDlg.h) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d) +++ src/ch/BufferSizeDlg.h (.../BufferSizeDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -32,10 +32,10 @@ const chcore::TBufferSizes& GetBufferSizes() const { return m_bsSizes; } protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual void OnLanguageChanged(); - virtual BOOL OnInitDialog(); - virtual void OnOK(); + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + void OnLanguageChanged() override; + BOOL OnInitDialog() override; + void OnOK() override; void OnOnlydefaultCheck(); void SetLANSize(UINT uiSize); Index: src/ch/CDragDropComboEx.h =================================================================== diff -u -r926b1177cffa2face218fabb3d8af71910d1b8e5 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/CDragDropComboEx.h (.../CDragDropComboEx.h) (revision 926b1177cffa2face218fabb3d8af71910d1b8e5) +++ src/ch/CDragDropComboEx.h (.../CDragDropComboEx.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -29,7 +29,7 @@ protected: afx_msg void OnDropFiles(HDROP hDrop); - virtual void PreSubclassWindow(); + void PreSubclassWindow() override; private: DECLARE_MESSAGE_MAP(); Index: src/ch/CDragDropListCtrl.h =================================================================== diff -u -r926b1177cffa2face218fabb3d8af71910d1b8e5 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/CDragDropListCtrl.h (.../CDragDropListCtrl.h) (revision 926b1177cffa2face218fabb3d8af71910d1b8e5) +++ src/ch/CDragDropListCtrl.h (.../CDragDropListCtrl.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -29,7 +29,7 @@ protected: afx_msg void OnDropFiles(HDROP hDrop); - virtual void PreSubclassWindow(); + void PreSubclassWindow() override; private: DECLARE_MESSAGE_MAP(); Index: src/ch/CrashDlg.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/CrashDlg.h (.../CrashDlg.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/CrashDlg.h (.../CrashDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -28,10 +28,10 @@ CCrashDlg(bool bResult, PCTSTR pszFilename, CWnd* pParent = nullptr); // standard constructor virtual ~CCrashDlg(); - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support DECLARE_MESSAGE_MAP() Index: src/ch/CustomCopyDlg.h =================================================================== diff -u -r4fe995b304ea342b50293f92d3c1992b43b820f7 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -36,11 +36,11 @@ // Overrides protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support // Implementation protected: - virtual void OnLanguageChanged(); + void OnLanguageChanged() override; void UpdateFilesListCtrlHeaderWidth(); @@ -55,12 +55,12 @@ void UpdateInternalTaskDefinition(); // Generated message map functions - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; afx_msg void OnAddDirectoryButton(); afx_msg void OnAddFilesButton(); afx_msg void OnRemoveButton(); afx_msg void OnBrowseButton(); - virtual void OnOK(); + void OnOK() override; afx_msg void OnChangebufferButton(); afx_msg void OnAddfilterButton(); afx_msg void OnRemovefilterButton(); Index: src/ch/DirTreeCtrl.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/DirTreeCtrl.h (.../DirTreeCtrl.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/DirTreeCtrl.h (.../DirTreeCtrl.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -106,8 +106,8 @@ // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CDirTreeCtrl) protected: - virtual void PreSubclassWindow(); - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + void PreSubclassWindow() override; + LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation Index: src/ch/FeedbackFileErrorDlg.h =================================================================== diff -u -r5f6477e71c348782f8149a86c7a3ae903e5ff635 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/FeedbackFileErrorDlg.h (.../FeedbackFileErrorDlg.h) (revision 5f6477e71c348782f8149a86c7a3ae903e5ff635) +++ src/ch/FeedbackFileErrorDlg.h (.../FeedbackFileErrorDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -44,7 +44,7 @@ CString m_strSrcPath; CString m_strDstPath; unsigned long m_ulSysError; - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; }; #endif Index: src/ch/FeedbackNotEnoughSpaceDlg.h =================================================================== diff -u -r5f6477e71c348782f8149a86c7a3ae903e5ff635 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/FeedbackNotEnoughSpaceDlg.h (.../FeedbackNotEnoughSpaceDlg.h) (revision 5f6477e71c348782f8149a86c7a3ae903e5ff635) +++ src/ch/FeedbackNotEnoughSpaceDlg.h (.../FeedbackNotEnoughSpaceDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -31,7 +31,7 @@ // Overrides protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support // Implementation public: Index: src/ch/FeedbackReplaceDlg.h =================================================================== diff -u -r5f6477e71c348782f8149a86c7a3ae903e5ff635 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 5f6477e71c348782f8149a86c7a3ae903e5ff635) +++ src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -27,7 +27,7 @@ CFeedbackReplaceDlg(const chcore::TFileInfo& spSrcFile, const chcore::TFileInfo& spDstFile, CWnd* pParent = nullptr); // standard constructor virtual ~CFeedbackReplaceDlg(); - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; bool IsApplyToAllItemsChecked() const; Index: src/ch/FilterDlg.h =================================================================== diff -u -r4fe995b304ea342b50293f92d3c1992b43b820f7 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/FilterDlg.h (.../FilterDlg.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/ch/FilterDlg.h (.../FilterDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -66,7 +66,7 @@ // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CFilterDlg) protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support //}}AFX_VIRTUAL // Implementation @@ -77,15 +77,15 @@ CStringArray m_astrAddExcludeMask; protected: - virtual void OnLanguageChanged(); + void OnLanguageChanged() override; int GetMultiplier(int iIndex); void EnableControls(); void SetSize1(unsigned __int64 ullSize); // Generated message map functions //{{AFX_MSG(CFilterDlg) - virtual BOOL OnInitDialog(); - virtual void OnOK(); + BOOL OnInitDialog() override; + void OnOK() override; afx_msg void OnAttributesCheck(); afx_msg void OnDateCheck(); afx_msg void OnDate2Check(); Index: src/ch/FolderDialog.h =================================================================== diff -u -r3c248d4f6d0fdb1e487cc868b2f0b219eec37ef4 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/FolderDialog.h (.../FolderDialog.h) (revision 3c248d4f6d0fdb1e487cc868b2f0b219eec37ef4) +++ src/ch/FolderDialog.h (.../FolderDialog.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -48,13 +48,13 @@ virtual ~CFolderDialog(); public: - virtual INT_PTR DoModal(); + INT_PTR DoModal() override; protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; public: - virtual BOOL OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip); + BOOL OnTooltipText(UINT uiID, TOOLTIPTEXT* pTip) override; // structure used for passing parameters struct BROWSEDATA @@ -127,10 +127,10 @@ afx_msg void OnSelchangedFolderTree(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnGetInfoTipFolderTree(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnShortcutKeyDown(NMHDR* pNMHDR, LRESULT* pResult); - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; afx_msg void OnNewfolderButton(); - virtual void OnCancel(); - virtual void OnOK(); + void OnCancel() override; + void OnOK() override; afx_msg void OnPathChanging(); afx_msg void OnIconsRadio(); afx_msg void OnSmalliconsRadio(); Index: src/ch/MainWnd.h =================================================================== diff -u -r3c248d4f6d0fdb1e487cc868b2f0b219eec37ef4 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/MainWnd.h (.../MainWnd.h) (revision 3c248d4f6d0fdb1e487cc868b2f0b219eec37ef4) +++ src/ch/MainWnd.h (.../MainWnd.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -39,7 +39,7 @@ BOOL Create(); protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; void PrepareDragAndDropMenuItems(TShellExtMenuConfig &cfgShellExt) const; void PrepareNormalMenuItems(TShellExtMenuConfig &cfgShellExt) const; Index: src/ch/MiniViewDlg.h =================================================================== diff -u -r71c49ab6ac2e657dee997cb9129c7d0d4dde21b6 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 71c49ab6ac2e657dee997cb9129c7d0d4dde21b6) +++ src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -68,15 +68,15 @@ void RefreshStatus(); void RecalcSize(int nHeight, bool bInitial); - virtual UINT GetLanguageUpdateOptions() { return LDF_NODIALOGSIZE; }; - virtual void OnLanguageChanged(); + UINT GetLanguageUpdateOptions() override { return LDF_NODIALOGSIZE; }; + void OnLanguageChanged() override; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; afx_msg HBRUSH OnCtlColor(CDC*, CWnd*, UINT); - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnSelchangeProgressList(); afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point); Index: src/ch/OptionsDlg.h =================================================================== diff -u -r306fbe693c70290af9de9a5779084a697de22d75 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/OptionsDlg.h (.../OptionsDlg.h) (revision 306fbe693c70290af9de9a5779084a697de22d75) +++ src/ch/OptionsDlg.h (.../OptionsDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -31,7 +31,7 @@ public: explicit COptionsDlg(CWnd* pParent = nullptr); // standard constructor - virtual void OnLanguageChanged(); + void OnLanguageChanged() override; void SendClosingNotify(); @@ -40,7 +40,7 @@ friend void RecentPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex); protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support private: void FillPropertyList(); @@ -53,9 +53,9 @@ CString MakeCompoundString(UINT uiBase, int iCount, LPCTSTR lpszSeparator); // Generated message map functions - virtual BOOL OnInitDialog(); - virtual void OnOK(); - virtual void OnCancel(); + BOOL OnInitDialog() override; + void OnOK() override; + void OnCancel() override; afx_msg void OnApplyButton(); DECLARE_MESSAGE_MAP() Index: src/ch/ProgressListBox.h =================================================================== diff -u -rb1ecc12ba4c1f2a7b4acd6e82fc4193535e55ff0 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision b1ecc12ba4c1f2a7b4acd6e82fc4193535e55ff0) +++ src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -56,7 +56,7 @@ // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CProgressListBox) public: - virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct); + void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) override; //}}AFX_VIRTUAL // Implementation Index: src/ch/PropertyListCtrl.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/PropertyListCtrl.h (.../PropertyListCtrl.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/PropertyListCtrl.h (.../PropertyListCtrl.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -68,7 +68,7 @@ void DrawTriangle(CDC* pDC, CRect Rect); public: - virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct ); + void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct ) override; virtual void MeasureItem(LPMEASUREITEMSTRUCT /*lpMeasureItemStruct*/); protected: @@ -177,8 +177,8 @@ // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CPropertyListCtrl) public: - virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct); - virtual void MeasureItem(LPMEASUREITEMSTRUCT /*lpMeasureItemStruct*/); + void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) override; + void MeasureItem(LPMEASUREITEMSTRUCT /*lpMeasureItemStruct*/) override; //}}AFX_VIRTUAL // Implementation Index: src/ch/RecentDlg.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/RecentDlg.h (.../RecentDlg.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/RecentDlg.h (.../RecentDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -29,10 +29,10 @@ explicit CRecentDlg(CWnd* pParent = nullptr); // standard constructor protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support protected: - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; afx_msg void OnItemchangedRecentList(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnBrowseButton(); afx_msg void OnAddButton(); Index: src/ch/ShutdownDlg.h =================================================================== diff -u -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/ShutdownDlg.h (.../ShutdownDlg.h) (revision cb4e9d4b60d62b25ae2cf556c0642601af56c787) +++ src/ch/ShutdownDlg.h (.../ShutdownDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -32,8 +32,8 @@ private: void FormatTimeString(int iTime, CString* pstrData); - virtual BOOL OnInitDialog(); - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + BOOL OnInitDialog() override; + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support afx_msg void OnTimer(UINT_PTR nIDEvent); Index: src/ch/StatusDlg.h =================================================================== diff -u -rd04caed42cbc16ffd508f173ca5f92d9512cfc69 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision d04caed42cbc16ffd508f173ca5f92d9512cfc69) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -55,11 +55,11 @@ void EnableControls(bool bEnable=true); protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + BOOL OnCommand(WPARAM wParam, LPARAM lParam) override; + LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; - virtual void OnLanguageChanged(); + void OnLanguageChanged() override; void PrepareResizableControls(); CString GetStatusString(const chcore::TTaskStatsSnapshotPtr& spTaskStats); @@ -80,7 +80,7 @@ CString GetSpeedString(double dSizeSpeed, double dAvgSizeSpeed, double dCountSpeed, double dAvgCountSpeed) const; void SetWindowTitle(PCTSTR pszText); - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; void SelectInitialTask(); @@ -99,7 +99,7 @@ afx_msg void OnRemoveFinishedButton(); afx_msg void OnKeydownStatusList(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnSelectionChanged(NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/); - virtual void OnCancel(); + void OnCancel() override; afx_msg void OnShowLogButton(); afx_msg void OnStickButton(); afx_msg void OnResumeButton(); Index: src/ch/TMsgBox.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/TMsgBox.h (.../TMsgBox.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/TMsgBox.h (.../TMsgBox.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -1,103 +1,103 @@ -// ============================================================================ -// Copyright (C) 2001-2014 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#ifndef __TMSGBOX_H__ -#define __TMSGBOX_H__ - -#include "..\libictranslate\LanguageDialog.h" - -class TMsgBox : public ictranslate::CLanguageDialog -{ -public: - enum EButtonConfig - { - eOk, - eCancel, - eOkCancel, - eYesNo, - eYesNoCancel - }; - - enum EIconConfig - { - eIcon_Info, - eIcon_Warning, - eIcon_Error - }; - -public: - TMsgBox(UINT uiMsgResourceID, EButtonConfig eButtons, EIconConfig eIcon, CWnd* pParent = nullptr); - TMsgBox(const CString& strMessage, EButtonConfig eButtons, EIconConfig eIcon, CWnd* pParent = nullptr); - virtual ~TMsgBox(); - - void SetCheckBoxMessage(UINT uiMsgResourceID); - void SetCheckBoxMessage(const CString& strCheckboxMessage); - - bool WasChecked() const; - - static INT_PTR MsgBox(UINT uiMsgResourceID, EButtonConfig eButtons, EIconConfig eIcon, UINT uiCheckboxResourceID = 0, bool* pbWasChecked = nullptr, CWnd* pParent = nullptr); - static INT_PTR MsgBox(const CString& strMessage, EButtonConfig eButtons, EIconConfig eIcon, const CString& strCheckboxText = CString(), bool* pbWasChecked = nullptr, CWnd* pParent = nullptr); - -protected: - virtual void DoDataExchange(CDataExchange* pDX); - virtual BOOL OnInitDialog(); - - void CalculateMinimumDlgSize(); - - void InitRichEdit(); - - virtual void OnCancel(); - void OnGetMinMaxInfo(MINMAXINFO* lpMMI); - - void InitializeControls(); - - void OnFirstButtonClicked(); - void OnSecondButtonClicked(); - void OnThirdButtonClicked(); - void OnRichEditResize(NMHDR* pNMHDR, LRESULT* pResult); - - CSize GetMaxSize(); - -private: - CRichEditCtrl m_ctlRichEdit; - CRichEditCtrl m_ctlMeasureRichEdit; - CButton m_ctlButton1; - CButton m_ctlButton2; - CButton m_ctlButton3; - CButton m_ctlCheck; - CStatic m_ctlImage; - - CString m_strMessageText; - - EIconConfig m_eIcon; - EButtonConfig m_eButtons; - - CString m_strCheckboxText; - - CRect m_rcRichEdit; - CRect m_rcDialogMinSize; - int m_iCheckBoxHeight; - - bool m_bCheckboxChecked; - -protected: - DECLARE_MESSAGE_MAP() - DECLARE_DYNAMIC(TMsgBox) -}; - -#endif +// ============================================================================ +// Copyright (C) 2001-2014 by Jozef Starosczyk +// ixen@copyhandler.com +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Library General Public License +// (version 2) as published by the Free Software Foundation; +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., +// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// ============================================================================ +#ifndef __TMSGBOX_H__ +#define __TMSGBOX_H__ + +#include "..\libictranslate\LanguageDialog.h" + +class TMsgBox : public ictranslate::CLanguageDialog +{ +public: + enum EButtonConfig + { + eOk, + eCancel, + eOkCancel, + eYesNo, + eYesNoCancel + }; + + enum EIconConfig + { + eIcon_Info, + eIcon_Warning, + eIcon_Error + }; + +public: + TMsgBox(UINT uiMsgResourceID, EButtonConfig eButtons, EIconConfig eIcon, CWnd* pParent = nullptr); + TMsgBox(const CString& strMessage, EButtonConfig eButtons, EIconConfig eIcon, CWnd* pParent = nullptr); + virtual ~TMsgBox(); + + void SetCheckBoxMessage(UINT uiMsgResourceID); + void SetCheckBoxMessage(const CString& strCheckboxMessage); + + bool WasChecked() const; + + static INT_PTR MsgBox(UINT uiMsgResourceID, EButtonConfig eButtons, EIconConfig eIcon, UINT uiCheckboxResourceID = 0, bool* pbWasChecked = nullptr, CWnd* pParent = nullptr); + static INT_PTR MsgBox(const CString& strMessage, EButtonConfig eButtons, EIconConfig eIcon, const CString& strCheckboxText = CString(), bool* pbWasChecked = nullptr, CWnd* pParent = nullptr); + +protected: + void DoDataExchange(CDataExchange* pDX) override; + BOOL OnInitDialog() override; + + void CalculateMinimumDlgSize(); + + void InitRichEdit(); + + void OnCancel() override; + void OnGetMinMaxInfo(MINMAXINFO* lpMMI); + + void InitializeControls(); + + void OnFirstButtonClicked(); + void OnSecondButtonClicked(); + void OnThirdButtonClicked(); + void OnRichEditResize(NMHDR* pNMHDR, LRESULT* pResult); + + CSize GetMaxSize(); + +private: + CRichEditCtrl m_ctlRichEdit; + CRichEditCtrl m_ctlMeasureRichEdit; + CButton m_ctlButton1; + CButton m_ctlButton2; + CButton m_ctlButton3; + CButton m_ctlCheck; + CStatic m_ctlImage; + + CString m_strMessageText; + + EIconConfig m_eIcon; + EButtonConfig m_eButtons; + + CString m_strCheckboxText; + + CRect m_rcRichEdit; + CRect m_rcDialogMinSize; + int m_iCheckBoxHeight; + + bool m_bCheckboxChecked; + +protected: + DECLARE_MESSAGE_MAP() + DECLARE_DYNAMIC(TMsgBox) +}; + +#endif Index: src/ch/ThemedButton.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/ThemedButton.h (.../ThemedButton.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/ThemedButton.h (.../ThemedButton.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -38,9 +38,9 @@ // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CThemedButton) public: - virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct); + void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) override; protected: - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; //}}AFX_VIRTUAL // Implementation Index: src/ch/UpdaterDlg.h =================================================================== diff -u -r12b36349f6214befeace08efa9acc7e03be0d847 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision 12b36349f6214befeace08efa9acc7e03be0d847) +++ src/ch/UpdaterDlg.h (.../UpdaterDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -25,7 +25,7 @@ CUpdaterDlg(bool bBackgroundMode, CWnd* pParent = nullptr); // standard constructor virtual ~CUpdaterDlg(); - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; void CheckForUpdates(); @@ -35,7 +35,7 @@ afx_msg void OnSelchangeChannelCombo(); protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support DECLARE_MESSAGE_MAP() Index: src/ch/shortcutsdlg.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ch/shortcutsdlg.h (.../shortcutsdlg.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/shortcutsdlg.h (.../shortcutsdlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -29,14 +29,14 @@ explicit CShortcutsDlg(CWnd* pParent = nullptr); // standard constructor protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support protected: void UpdateComboIcon(); void SetComboPath(LPCTSTR lpszPath); // Generated message map functions - virtual BOOL OnInitDialog(); + BOOL OnInitDialog() override; afx_msg void OnItemchangedShortcutList(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnEditchangePathComboboxex(); afx_msg void OnAddButton(); Index: src/ictranslate/ICTranslateDlg.cpp =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ictranslate/ICTranslateDlg.cpp (.../ICTranslateDlg.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ictranslate/ICTranslateDlg.cpp (.../ICTranslateDlg.cpp) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -46,7 +46,7 @@ enum { IDD = IDD_ABOUTBOX }; protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support // Implementation protected: Index: src/ictranslate/ICTranslateDlg.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ictranslate/ICTranslateDlg.h (.../ICTranslateDlg.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ictranslate/ICTranslateDlg.h (.../ICTranslateDlg.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -30,7 +30,7 @@ explicit CICTranslateDlg(CWnd* pParent = nullptr); // standard constructor // Dialog Data - virtual BOOL PreTranslateMessage(MSG* pMsg); + BOOL PreTranslateMessage(MSG* pMsg) override; afx_msg void OnFileOpenBaseTranslation(); afx_msg void OnFileOpenYourTranslation(); afx_msg void OnItemChangedSrcDataList(NMHDR *pNMHDR, LRESULT *pResult); @@ -52,9 +52,9 @@ afx_msg void OnFileSaveTranslation(); protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnInitDialog(); - virtual void OnCancel(); + void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support + BOOL OnInitDialog() override; + void OnCancel() override; afx_msg void OnSysCommand(UINT nID, LPARAM lParam); afx_msg void OnPaint(); afx_msg HCURSOR OnQueryDragIcon(); Index: src/ictranslate/ictranslate.h =================================================================== diff -u -r4fe995b304ea342b50293f92d3c1992b43b820f7 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/ictranslate/ictranslate.h (.../ictranslate.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/ictranslate/ictranslate.h (.../ictranslate.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -36,7 +36,7 @@ // Overrides public: - virtual BOOL InitInstance(); + BOOL InitInstance() override; // Implementation Index: src/libchcore/TCoreWin32Exception.h =================================================================== diff -u -ra4635addad389b9e117679437a3e1b64a739ea96 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TCoreWin32Exception.h (.../TCoreWin32Exception.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TCoreWin32Exception.h (.../TCoreWin32Exception.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -30,8 +30,8 @@ DWORD GetWin32ErrorCode() const { return m_dwWin32ErrorCode; } - virtual void GetErrorInfo(wchar_t* pszBuffer, size_t stMaxBuffer) const; - virtual void GetDetailedErrorInfo(wchar_t* pszBuffer, size_t stMaxBuffer) const; + void GetErrorInfo(wchar_t* pszBuffer, size_t stMaxBuffer) const override; + void GetDetailedErrorInfo(wchar_t* pszBuffer, size_t stMaxBuffer) const override; protected: DWORD m_dwWin32ErrorCode; Index: src/libchcore/TFeedbackHandlerBase.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TFeedbackHandlerBase.h (.../TFeedbackHandlerBase.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -49,9 +49,9 @@ virtual void RestoreDefaults() override; // serialization - void Store(const ISerializerContainerPtr& spContainer) const; + void Store(const ISerializerContainerPtr& spContainer) const override; static void InitColumns(const ISerializerContainerPtr& spContainer); - void Load(const ISerializerContainerPtr& spContainer); + void Load(const ISerializerContainerPtr& spContainer) override; virtual DWORD GetRetryInterval() const override; Index: src/libchcore/TLocalFilesystemFile.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TLocalFilesystemFile.h (.../TLocalFilesystemFile.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TLocalFilesystemFile.h (.../TLocalFilesystemFile.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -52,7 +52,7 @@ void Close() override; file_size_t GetSeekPositionForResume(file_size_t fsLastAvailablePosition) override; - void SetBasicInfo(DWORD dwAttributes, const TFileTime& ftCreationTime, const TFileTime& ftLastAccessTime, const TFileTime& ftLastWriteTime); + void SetBasicInfo(DWORD dwAttributes, const TFileTime& ftCreationTime, const TFileTime& ftLastAccessTime, const TFileTime& ftLastWriteTime) override; private: TLocalFilesystemFile(EOpenMode eMode, const TSmartPath& pathFile, bool bNoBuffering, bool bProtectReadOnlyFiles, const logger::TLogFileDataPtr& spLogFileData); Index: src/libchcore/TSQLiteColumnDefinition.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSQLiteColumnDefinition.h (.../TSQLiteColumnDefinition.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSQLiteColumnDefinition.h (.../TSQLiteColumnDefinition.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -31,14 +31,14 @@ TSQLiteColumnsDefinition(); virtual ~TSQLiteColumnsDefinition(); - virtual size_t AddColumn(const TString& strColumnName, ETypes eColType); - virtual void Clear(); + size_t AddColumn(const TString& strColumnName, ETypes eColType) override; + void Clear() override; - virtual size_t GetColumnIndex(const wchar_t* strColumnName); + size_t GetColumnIndex(const wchar_t* strColumnName) override; virtual ETypes GetColumnType(size_t stIndex) const; - virtual const TString& GetColumnName(size_t stIndex) const; - virtual size_t GetCount() const; - virtual bool IsEmpty() const; + const TString& GetColumnName(size_t stIndex) const override; + size_t GetCount() const override; + bool IsEmpty() const override; virtual TString GetCommaSeparatedColumns() const; Index: src/libchcore/TSQLiteSerializer.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSQLiteSerializer.h (.../TSQLiteSerializer.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSQLiteSerializer.h (.../TSQLiteSerializer.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -37,10 +37,10 @@ TSQLiteSerializer(const TSmartPath& pathDB, const ISerializerSchemaPtr& spSchema); virtual ~TSQLiteSerializer(); - virtual TSmartPath GetLocation() const; + TSmartPath GetLocation() const override; - virtual ISerializerContainerPtr GetContainer(const TString& strContainerName); - virtual void Flush(); + ISerializerContainerPtr GetContainer(const TString& strContainerName) override; + void Flush() override; void SetupDBOptions(); private: Index: src/libchcore/TSQLiteSerializerContainer.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSQLiteSerializerContainer.h (.../TSQLiteSerializerContainer.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSQLiteSerializerContainer.h (.../TSQLiteSerializerContainer.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -40,13 +40,13 @@ TSQLiteSerializerContainer(const TString& strName, const sqlite::TSQLiteDatabasePtr& spDB, TPlainStringPool& poolStrings); virtual ~TSQLiteSerializerContainer(); - virtual IColumnsDefinition& GetColumnsDefinition(); + IColumnsDefinition& GetColumnsDefinition() override; - virtual ISerializerRowData& GetRow(object_id_t oidRowID, bool bMarkAsAdded); - virtual void DeleteRow(object_id_t oidRowID); - virtual void DeleteRows(const TRemovedObjects& setObjects); + ISerializerRowData& GetRow(object_id_t oidRowID, bool bMarkAsAdded) override; + void DeleteRow(object_id_t oidRowID) override; + void DeleteRows(const TRemovedObjects& setObjects) override; - virtual ISerializerRowReaderPtr GetRowReader(); + ISerializerRowReaderPtr GetRowReader() override; void Flush(); Index: src/libchcore/TSQLiteSerializerRowData.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSQLiteSerializerRowData.h (.../TSQLiteSerializerRowData.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSQLiteSerializerRowData.h (.../TSQLiteSerializerRowData.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -44,31 +44,31 @@ TSQLiteSerializerRowData& operator=(const TSQLiteSerializerRowData& rSrc); - virtual ISerializerRowData& SetValue(size_t stColIndex, bool bValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, short iValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, unsigned short uiValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, int iValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, unsigned int uiValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, long lValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, unsigned long ulValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, long long llValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, unsigned long long llValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, double dValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, const TString& strValue); - virtual ISerializerRowData& SetValue(size_t stColIndex, const TSmartPath& pathValue); + ISerializerRowData& SetValue(size_t stColIndex, bool bValue) override; + ISerializerRowData& SetValue(size_t stColIndex, short iValue) override; + ISerializerRowData& SetValue(size_t stColIndex, unsigned short uiValue) override; + ISerializerRowData& SetValue(size_t stColIndex, int iValue) override; + ISerializerRowData& SetValue(size_t stColIndex, unsigned int uiValue) override; + ISerializerRowData& SetValue(size_t stColIndex, long lValue) override; + ISerializerRowData& SetValue(size_t stColIndex, unsigned long ulValue) override; + ISerializerRowData& SetValue(size_t stColIndex, long long llValue) override; + ISerializerRowData& SetValue(size_t stColIndex, unsigned long long llValue) override; + ISerializerRowData& SetValue(size_t stColIndex, double dValue) override; + ISerializerRowData& SetValue(size_t stColIndex, const TString& strValue) override; + ISerializerRowData& SetValue(size_t stColIndex, const TSmartPath& pathValue) override; - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, bool bValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, short iValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, unsigned short uiValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, int iValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, unsigned int uiValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, long lValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, unsigned long ulValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, long long llValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, unsigned long long llValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, double dValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, const TString& strValue); - virtual ISerializerRowData& SetValue(const wchar_t* strColumnName, const TSmartPath& pathValue); + ISerializerRowData& SetValue(const wchar_t* strColumnName, bool bValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, short iValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, unsigned short uiValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, int iValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, unsigned int uiValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, long lValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, unsigned long ulValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, long long llValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, unsigned long long llValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, double dValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, const TString& strValue) override; + ISerializerRowData& SetValue(const wchar_t* strColumnName, const TSmartPath& pathValue) override; TString GetQuery(const TString& strContainerName) const; unsigned long long GetChangeIdentification() const; Index: src/libchcore/TSQLiteSerializerRowReader.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSQLiteSerializerRowReader.h (.../TSQLiteSerializerRowReader.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSQLiteSerializerRowReader.h (.../TSQLiteSerializerRowReader.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -35,20 +35,20 @@ TSQLiteSerializerRowReader(const sqlite::TSQLiteDatabasePtr& spDatabase, TSQLiteColumnsDefinition& rColumns, const TString& strContainerName); virtual ~TSQLiteSerializerRowReader(); - virtual bool Next(); + bool Next() override; - virtual void GetValue(const TString& strColName, bool& bValue); - virtual void GetValue(const TString& strColName, short& iValue); - virtual void GetValue(const TString& strColName, unsigned short& uiValue); - virtual void GetValue(const TString& strColName, int& iValue); - virtual void GetValue(const TString& strColName, unsigned int& uiValue); - virtual void GetValue(const TString& strColName, long& lValue); - virtual void GetValue(const TString& strColName, unsigned long& ulValue); - virtual void GetValue(const TString& strColName, long long& llValue); - virtual void GetValue(const TString& strColName, unsigned long long& ullValue); - virtual void GetValue(const TString& strColName, double& dValue); - virtual void GetValue(const TString& strColName, TString& strValue); - virtual void GetValue(const TString& strColName, TSmartPath& pathValue); + void GetValue(const TString& strColName, bool& bValue) override; + void GetValue(const TString& strColName, short& iValue) override; + void GetValue(const TString& strColName, unsigned short& uiValue) override; + void GetValue(const TString& strColName, int& iValue) override; + void GetValue(const TString& strColName, unsigned int& uiValue) override; + void GetValue(const TString& strColName, long& lValue) override; + void GetValue(const TString& strColName, unsigned long& ulValue) override; + void GetValue(const TString& strColName, long long& llValue) override; + void GetValue(const TString& strColName, unsigned long long& ullValue) override; + void GetValue(const TString& strColName, double& dValue) override; + void GetValue(const TString& strColName, TString& strValue) override; + void GetValue(const TString& strColName, TSmartPath& pathValue) override; private: int GetColumnIndex(const TString& strColName) const; Index: src/libchcore/TSQLiteTaskManagerSchema.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSQLiteTaskManagerSchema.h (.../TSQLiteTaskManagerSchema.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSQLiteTaskManagerSchema.h (.../TSQLiteTaskManagerSchema.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -30,7 +30,7 @@ TSQLiteTaskManagerSchema(); virtual ~TSQLiteTaskManagerSchema(); - virtual void Setup(const sqlite::TSQLiteDatabasePtr& spDatabase); + void Setup(const sqlite::TSQLiteDatabasePtr& spDatabase) override; }; typedef std::shared_ptr TTaskManagerSchemaPtr; Index: src/libchcore/TSQLiteTaskSchema.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSQLiteTaskSchema.h (.../TSQLiteTaskSchema.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSQLiteTaskSchema.h (.../TSQLiteTaskSchema.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -31,7 +31,7 @@ TSQLiteTaskSchema(); virtual ~TSQLiteTaskSchema(); - virtual void Setup(const sqlite::TSQLiteDatabasePtr& spDatabase); + void Setup(const sqlite::TSQLiteDatabasePtr& spDatabase) override; private: void CreateNewDatabase(const sqlite::TSQLiteDatabasePtr& spDatabase, TSerializerVersion &tVersion); Index: src/libchcore/TSubTaskCopyMove.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -46,18 +46,18 @@ public: explicit TSubTaskCopyMove(TSubTaskContext& tSubTaskContext); - virtual void Reset(); + void Reset() override; virtual void InitBeforeExec() override; virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Copying; } - virtual void Store(const ISerializerPtr& spSerializer) const; - virtual void Load(const ISerializerPtr& spSerializer); + void Store(const ISerializerPtr& spSerializer) const override; + void Load(const ISerializerPtr& spSerializer) override; void InitColumns(const ISerializerContainerPtr& spContainer) const; - virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const; + void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const override; private: TBufferSizes::EBufferType GetBufferIndex(const TBufferSizes& rBufferSizes, const TFileInfoPtr& spFileInfo); Index: src/libchcore/TSubTaskDelete.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSubTaskDelete.h (.../TSubTaskDelete.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskDelete.h (.../TSubTaskDelete.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -36,18 +36,18 @@ public: explicit TSubTaskDelete(TSubTaskContext& rContext); - virtual void Reset(); + void Reset() override; virtual void InitBeforeExec() override; virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Deleting; } - virtual void Store(const ISerializerPtr& spSerializer) const; - virtual void Load(const ISerializerPtr& spSerializer); + void Store(const ISerializerPtr& spSerializer) const override; + void Load(const ISerializerPtr& spSerializer) override; void InitColumns(const ISerializerContainerPtr& spContainer) const; - virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& spStats) const; + void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& spStats) const override; private: #pragma warning(push) Index: src/libchcore/TSubTaskFastMove.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSubTaskFastMove.h (.../TSubTaskFastMove.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskFastMove.h (.../TSubTaskFastMove.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -39,14 +39,14 @@ explicit TSubTaskFastMove(TSubTaskContext& rContext); virtual ~TSubTaskFastMove(); - virtual void Reset(); + void Reset() override; virtual void InitBeforeExec() override; virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_FastMove; } - virtual void Store(const ISerializerPtr& spSerializer) const; - virtual void Load(const ISerializerPtr& spSerializer); + void Store(const ISerializerPtr& spSerializer) const override; + void Load(const ISerializerPtr& spSerializer) override; void InitColumns(const ISerializerContainerPtr& spContainer) const; Index: src/libchcore/TSubTaskScanDirectory.h =================================================================== diff -u -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) +++ src/libchcore/TSubTaskScanDirectory.h (.../TSubTaskScanDirectory.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -41,16 +41,16 @@ explicit TSubTaskScanDirectories(TSubTaskContext& rContext); virtual ~TSubTaskScanDirectories(); - virtual void Reset(); + void Reset() override; virtual void InitBeforeExec() override; virtual ESubOperationResult Exec(const IFeedbackHandlerPtr& spFeedbackHandler) override; virtual ESubOperationType GetSubOperationType() const override { return eSubOperation_Scanning; } - virtual void Store(const ISerializerPtr& spSerializer) const; - virtual void Load(const ISerializerPtr& spSerializer); + void Store(const ISerializerPtr& spSerializer) const override; + void Load(const ISerializerPtr& spSerializer) override; - virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& spStats) const; + void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& spStats) const override; private: int ScanDirectory(TSmartPath pathDirName, const TBasePathDataPtr& spBasePathData, Index: src/libchcore/TTimestampProviderTickCount.h =================================================================== diff -u -ra4635addad389b9e117679437a3e1b64a739ea96 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libchcore/TTimestampProviderTickCount.h (.../TTimestampProviderTickCount.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TTimestampProviderTickCount.h (.../TTimestampProviderTickCount.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -29,7 +29,7 @@ public: TTimestampProviderTickCount(); - virtual unsigned long long GetCurrentTimestamp() const; + unsigned long long GetCurrentTimestamp() const override; private: mutable unsigned long long m_ullTimestampAdjustment; Index: src/libictranslate/LanguageDialog.h =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libictranslate/LanguageDialog.h (.../LanguageDialog.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/libictranslate/LanguageDialog.h (.../LanguageDialog.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -189,7 +189,7 @@ static void SetResManager(CResourceManager* prm) { m_prm=prm; }; // creation - virtual INT_PTR DoModal(); + INT_PTR DoModal() override; virtual BOOL Create(); void MapRect(RECT* pRect); @@ -212,11 +212,11 @@ void Cleanup(); virtual BOOL OnTooltipText(UINT /*uiID*/, TOOLTIPTEXT* /*pTip*/) { return FALSE; }; - virtual BOOL OnInitDialog(); - virtual void OnCancel(); - virtual void OnOK(); - virtual void PostNcDestroy(); - virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); + BOOL OnInitDialog() override; + void OnCancel() override; + void OnOK() override; + void PostNcDestroy() override; + LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam) override; DECLARE_MESSAGE_MAP() private: Index: src/libictranslate/cfg_ini.h =================================================================== diff -u -r4fe995b304ea342b50293f92d3c1992b43b820f7 -r12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45 --- src/libictranslate/cfg_ini.h (.../cfg_ini.h) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/libictranslate/cfg_ini.h (.../cfg_ini.h) (revision 12ee49f6bf1f8921500ee2078e0a8c2d7b6d2a45) @@ -41,26 +41,26 @@ /** \name File operations */ /**@{*/ /// Reads the xml document from the specified file - virtual void read(const wchar_t* pszPath); + void read(const wchar_t* pszPath) override; /// Processes the data from a given buffer - virtual void read_from_buffer(const wchar_t* pszBuffer, size_t stLen); + void read_from_buffer(const wchar_t* pszBuffer, size_t stLen) override; /// Saves the internal data to a specified file as the xml document - virtual void save(const wchar_t* pszPath); + void save(const wchar_t* pszPath) override; /**@}*/ /** \name Key and value handling */ /**@{*/ /// Searches for a specified key (given all the path to a specific string) - virtual void* find(const wchar_t* pszName); + void* find(const wchar_t* pszName) override; /// Searches for the next string - virtual bool find_next(void* pFindHandle, PROPINFO& pi); + bool find_next(void* pFindHandle, PROPINFO& pi) override; /// Closes the search operation - virtual void find_close(void* pFindHandle); + void find_close(void* pFindHandle) override; /// Sets a value for a given key - virtual void set_value(const wchar_t* pszName, const wchar_t* pszValue, actions a=action_add); + void set_value(const wchar_t* pszName, const wchar_t* pszValue, actions a=action_add) override; /// Clear values for a given property name - virtual void clear(const wchar_t* pszName); + void clear(const wchar_t* pszName) override; /// Clears all entries virtual void clear(); /**@}*/