From 29f28098ae81e24cb13236159421f42f6acb4d1a Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Sun, 29 Oct 2017 18:11:05 +0200 Subject: [PATCH] Fix static analyzer issue "A virtual function was overridden incorrectly" V762 It is possible a virtual function was overridden incorrectly. See third argument of function 'create' in derived class 'UserDefineDialog' and base class 'StaticDialog'. userdefinedialog.h 332 V762 It is possible a virtual function was overridden incorrectly. See first argument of function 'redraw' in derived class 'SplitterContainer' and base class 'Window'. splittercontainer.h 61 V762 It is possible a virtual function was overridden incorrectly. See third argument of function 'create' in derived class 'FindReplaceDlg' and base class 'StaticDialog'. findreplacedlg.h 245 V762 It is possible a virtual function was overridden incorrectly. See third argument of function 'create' in derived class 'GoToLineDlg' and base class 'StaticDialog'. gotolinedlg.h 45 V762 It is possible a virtual function was overridden incorrectly. See third argument of function 'create' in derived class 'FindCharsInRangeDlg' and base class 'StaticDialog'. findcharsinrange.h 52 V762 It is possible a virtual function was overridden incorrectly. See third argument of function 'create' in derived class 'ColumnEditorDlg' and base class 'StaticDialog'. columneditor.h 45 V762 It is possible a virtual function was overridden incorrectly. See third argument of function 'create' in derived class 'WordStyleDlg' and base class 'StaticDialog'. wordstyledlg.h 77 V762 It is possible a virtual function was overridden incorrectly. See first argument of function 'redraw' in derived class 'WordStyleDlg' and base class 'Window'. wordstyledlg.h 99 V762 It is possible a virtual function was overridden incorrectly. See third argument of function 'create' in derived class 'PluginsAdminDlg' and base class 'StaticDialog'. pluginsadmin.h 100 --- PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp | 4 ++-- PowerEditor/src/ScitillaComponent/FindReplaceDlg.h | 2 +- PowerEditor/src/ScitillaComponent/GoToLineDlg.h | 4 ++-- PowerEditor/src/ScitillaComponent/UserDefineDialog.h | 4 ++-- PowerEditor/src/ScitillaComponent/columnEditor.h | 4 ++-- PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp | 4 ++-- PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h | 4 ++-- .../src/WinControls/FindCharsInRange/FindCharsInRange.h | 4 ++-- PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp | 4 ++-- PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h | 2 +- .../src/WinControls/SplitterContainer/SplitterContainer.cpp | 2 +- .../src/WinControls/SplitterContainer/SplitterContainer.h | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 038122fdd..29655a5cd 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -242,9 +242,9 @@ FindReplaceDlg::~FindReplaceDlg() delete[] _uniFileName; } -void FindReplaceDlg::create(int dialogID, bool isRTL) +void FindReplaceDlg::create(int dialogID, bool isRTL, bool msgDestParent) { - StaticDialog::create(dialogID, isRTL); + StaticDialog::create(dialogID, isRTL, msgDestParent); fillFindHistory(); _currentStatus = REPLACE_DLG; initOptionsFromDlg(); diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h index e2b4b2e70..3e6eb1c65 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h @@ -242,7 +242,7 @@ public : _ppEditView = ppEditView; }; - virtual void create(int dialogID, bool isRTL = false); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true); void initOptionsFromDlg(); diff --git a/PowerEditor/src/ScitillaComponent/GoToLineDlg.h b/PowerEditor/src/ScitillaComponent/GoToLineDlg.h index b7fd9ffa5..124083111 100644 --- a/PowerEditor/src/ScitillaComponent/GoToLineDlg.h +++ b/PowerEditor/src/ScitillaComponent/GoToLineDlg.h @@ -42,8 +42,8 @@ public : _ppEditView = ppEditView; }; - virtual void create(int dialogID, bool isRTL = false) { - StaticDialog::create(dialogID, isRTL); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true) { + StaticDialog::create(dialogID, isRTL, msgDestParent); }; void doDialog(bool isRTL = false) { diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h index 382626ad2..835d9ec83 100644 --- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h +++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h @@ -329,8 +329,8 @@ public : void setScintilla(ScintillaEditView *pScinView) { _pScintilla = pScinView; }; - virtual void create(int dialogID, bool isRTL = false) { - StaticDialog::create(dialogID, isRTL); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true) { + StaticDialog::create(dialogID, isRTL, msgDestParent); } void destroy() { // A Ajouter les fils... diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.h b/PowerEditor/src/ScitillaComponent/columnEditor.h index 9201443dd..468523af0 100644 --- a/PowerEditor/src/ScitillaComponent/columnEditor.h +++ b/PowerEditor/src/ScitillaComponent/columnEditor.h @@ -42,8 +42,8 @@ public : void init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView); - virtual void create(int dialogID, bool isRTL = false) { - StaticDialog::create(dialogID, isRTL); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true) { + StaticDialog::create(dialogID, isRTL, msgDestParent); }; void doDialog(bool isRTL = false) { diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 9728ad654..522336308 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -836,9 +836,9 @@ void WordStyleDlg::setVisualFromStyleList() } -void WordStyleDlg::create(int dialogID, bool isRTL) +void WordStyleDlg::create(int dialogID, bool isRTL, bool msgDestParent) { - StaticDialog::create(dialogID, isRTL); + StaticDialog::create(dialogID, isRTL, msgDestParent); if ((NppParameters::getInstance())->isTransparentAvailable()) { diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h index f9eb7463c..3268bf7fe 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h @@ -74,7 +74,7 @@ public : Window::init(hInst, parent); }; - virtual void create(int dialogID, bool isRTL = false); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true); void doDialog(bool isRTL = false) { if (!isCreated()) @@ -96,7 +96,7 @@ public : _gOverride2restored = (NppParameters::getInstance())->getGlobalOverrideStyle(); }; - virtual void redraw() const { + virtual void redraw(bool forceUpdate = false) const { _pFgColour->redraw(); _pBgColour->redraw(); ::InvalidateRect(_hStyleInfoStaticText, NULL, TRUE); diff --git a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h index c09555d68..39a803517 100644 --- a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h +++ b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h @@ -49,8 +49,8 @@ public : _ppEditView = ppEditView; }; - virtual void create(int dialogID, bool isRTL = false) { - StaticDialog::create(dialogID, isRTL); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true) { + StaticDialog::create(dialogID, isRTL, msgDestParent); }; void doDialog(bool isRTL = false) { diff --git a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp index 249051191..50eb7bcdb 100644 --- a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp +++ b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp @@ -203,12 +203,12 @@ long PluginsAdminDlg::searchFromCurrentSel(generic_string str2search, bool inWhi return -1; } -void PluginsAdminDlg::create(int dialogID, bool isRTL) +void PluginsAdminDlg::create(int dialogID, bool isRTL, bool msgDestParent) { // get plugin installation path and launch mode (Admin or normal) collectNppCurrentStatusInfos(); - StaticDialog::create(dialogID, isRTL); + StaticDialog::create(dialogID, isRTL, msgDestParent); RECT rect; getClientRect(rect); diff --git a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h index 6b5abdbc2..4843b183b 100644 --- a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h +++ b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h @@ -97,7 +97,7 @@ public : Window::init(hInst, parent); }; - virtual void create(int dialogID, bool isRTL = false); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true); void doDialog(bool isRTL = false) { if (!isCreated()) diff --git a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp index 2ef779fde..e6a32f5e0 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp +++ b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp @@ -118,7 +118,7 @@ void SplitterContainer::display(bool toShow) const } -void SplitterContainer::redraw() const +void SplitterContainer::redraw(bool forceUpdate) const { assert(_pWin0 != nullptr); assert(_pWin1 != nullptr); diff --git a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h index 9675b2bd8..7a9bd0f18 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h +++ b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h @@ -58,7 +58,7 @@ public : virtual void display(bool toShow = true) const; - virtual void redraw() const; + virtual void redraw(bool forceUpdate = false) const; void setWin0(Window* pWin) {