From 15b7a26c87df6d6da87c4079c3779fd3aa434bfb Mon Sep 17 00:00:00 2001 From: Don HO Date: Fri, 16 Apr 2021 02:37:05 +0200 Subject: [PATCH] Remove unecessary const type qualifier --- PowerEditor/src/Notepad_plus.cpp | 24 ++++++++--------- PowerEditor/src/Notepad_plus_Window.cpp | 2 +- PowerEditor/src/NppBigSwitch.cpp | 14 +++++----- PowerEditor/src/NppCommands.cpp | 8 +++--- PowerEditor/src/NppIO.cpp | 6 ++--- PowerEditor/src/NppNotification.cpp | 2 +- PowerEditor/src/Parameters.h | 2 +- .../src/ScintillaComponent/FindReplaceDlg.cpp | 8 +++--- .../WinControls/Preference/preferenceDlg.cpp | 26 +++++++++---------- PowerEditor/src/winmain.cpp | 2 +- 10 files changed, 47 insertions(+), 47 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index a49808147..15c2294aa 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -192,7 +192,7 @@ Notepad_plus::~Notepad_plus() LRESULT Notepad_plus::init(HWND hwnd) { NppParameters& nppParam = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); // Menu _mainMenuHandle = ::GetMenu(hwnd); @@ -750,7 +750,7 @@ void Notepad_plus::killAllChildren() bool Notepad_plus::saveGUIParams() { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); nppGUI._toolbarShow = _rebarTop.getIDVisible(REBAR_BAR_TOOLBAR); nppGUI._toolBarStatus = _toolBar.getState(); @@ -830,7 +830,7 @@ bool Notepad_plus::saveFileBrowserParam() void Notepad_plus::saveDockingParams() { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); // Save the docking information nppGUI._dockingData._leftWidth = _dockingManager.getDockedContSize(CONT_LEFT); @@ -1840,8 +1840,8 @@ bool Notepad_plus::findInFilelist(std::vector & fileNames) if (nbTotal != 0) { - const NppParameters& nppParam = NppParameters::getInstance(); - const NppGUI& nppGui = nppParam.getNppGUI(); + NppParameters& nppParam = NppParameters::getInstance(); + NppGUI& nppGui = nppParam.getNppGUI(); if (!nppGui._findDlgAlwaysVisible) { _findReplaceDlg.display(false); @@ -1914,8 +1914,8 @@ bool Notepad_plus::findInOpenedFiles() if (nbTotal != 0) { - const NppParameters& nppParam = NppParameters::getInstance(); - const NppGUI& nppGui = nppParam.getNppGUI(); + NppParameters& nppParam = NppParameters::getInstance(); + NppGUI& nppGui = nppParam.getNppGUI(); if (!nppGui._findDlgAlwaysVisible) { _findReplaceDlg.display(false); @@ -1971,8 +1971,8 @@ bool Notepad_plus::findInCurrentFile(bool isEntireDoc) if (nbTotal != 0) { - const NppParameters& nppParam = NppParameters::getInstance(); - const NppGUI& nppGui = nppParam.getNppGUI(); + NppParameters& nppParam = NppParameters::getInstance(); + NppGUI& nppGui = nppParam.getNppGUI(); if (!nppGui._findDlgAlwaysVisible) { _findReplaceDlg.display(false); @@ -5129,7 +5129,7 @@ bool Notepad_plus::goToPreviousIndicator(int indicID2Search, bool isWrap) const // found if (_pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search, posStart)) { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); nppGUI._disableSmartHiliteTmp = true; auto currentline = _pEditView->execute(SCI_LINEFROMPOSITION, posEnd); @@ -5182,7 +5182,7 @@ bool Notepad_plus::goToNextIndicator(int indicID2Search, bool isWrap) const // found if (_pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search, posStart)) { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); nppGUI._disableSmartHiliteTmp = true; auto currentline = _pEditView->execute(SCI_LINEFROMPOSITION, posEnd); @@ -5346,7 +5346,7 @@ void Notepad_plus::postItToggle() { if (!_beforeSpecialView._isPostIt) // PostIt disabled, enable it { - NppGUI & nppGUI = const_cast(NppParameters::getInstance().getNppGUI()); + NppGUI & nppGUI = NppParameters::getInstance().getNppGUI(); // get current status before switch to postIt //check these always { diff --git a/PowerEditor/src/Notepad_plus_Window.cpp b/PowerEditor/src/Notepad_plus_Window.cpp index 71942bf50..d0b786f4f 100644 --- a/PowerEditor/src/Notepad_plus_Window.cpp +++ b/PowerEditor/src/Notepad_plus_Window.cpp @@ -83,7 +83,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin } NppParameters& nppParams = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParams.getNppGUI()); + NppGUI & nppGUI = nppParams.getNppGUI(); if (cmdLineParams->_isNoPlugin) _notepad_plus_plus_core._pluginsManager.disable(); diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index e35204113..ff4388ab0 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -513,7 +513,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case NPPM_DISABLEAUTOUPDATE: { - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); nppGUI._autoUpdateOpt._doAutoUpdate = false; return TRUE; } @@ -1652,7 +1652,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case NPPM_INTERNAL_ENABLECHECKDOCOPT: { - NppGUI& nppgui = const_cast((nppParam.getNppGUI())); + NppGUI& nppgui = nppParam.getNppGUI(); if (wParam == CHECKDOCOPT_NONE) nppgui._fileAutoDetection = cdDisabled; else if (wParam == CHECKDOCOPT_UPDATESILENTLY) @@ -2188,7 +2188,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa DocTabView::setHideTabBarStatus(hide); ::SendMessage(hwnd, WM_SIZE, 0, 0); - NppGUI & nppGUI = const_cast(((NppParameters::getInstance()).getNppGUI())); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); if (hide) nppGUI._tabStatus |= TAB_HIDE; else @@ -2223,7 +2223,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa if (hide == isHidden) return isHidden; - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); nppGUI._menuBarShow = !hide; if (nppGUI._menuBarShow) ::SetMenu(hwnd, _mainMenuHandle); @@ -2241,7 +2241,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case NPPM_HIDESTATUSBAR: { bool show = (lParam != TRUE); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); bool oldVal = nppGUI._statusBarShow; if (show == oldVal) return oldVal; @@ -2319,7 +2319,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case NPPM_INTERNAL_DISABLEAUTOUPDATE: { //printStr(TEXT("you've got me")); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); nppGUI._autoUpdateOpt._doAutoUpdate = false; return TRUE; } @@ -2343,7 +2343,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case NPPM_DOCSWITCHERDISABLECOLUMN: { BOOL isOff = static_cast(lParam); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); nppGUI._fileSwitcherWithoutExtColumn = isOff == TRUE; if (_pFileSwitcherPanel) diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 335917241..3a085241c 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -3383,7 +3383,7 @@ void Notepad_plus::command(int id) case IDM_SYSTRAYPOPUP_NEWDOC: { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); ::ShowWindow(_pPublicInterface->getHSelf(), nppGUI._isMaximized?SW_MAXIMIZE:SW_SHOW); _dockingManager.showFloatingContainers(true); restoreMinimizeDialogs(); @@ -3393,7 +3393,7 @@ void Notepad_plus::command(int id) case IDM_SYSTRAYPOPUP_ACTIVATE : { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); ::ShowWindow(_pPublicInterface->getHSelf(), nppGUI._isMaximized?SW_MAXIMIZE:SW_SHOW); _dockingManager.showFloatingContainers(true); restoreMinimizeDialogs(); @@ -3405,7 +3405,7 @@ void Notepad_plus::command(int id) case IDM_SYSTRAYPOPUP_NEW_AND_PASTE: { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); ::ShowWindow(_pPublicInterface->getHSelf(), nppGUI._isMaximized?SW_MAXIMIZE:SW_SHOW); _dockingManager.showFloatingContainers(true); restoreMinimizeDialogs(); @@ -3422,7 +3422,7 @@ void Notepad_plus::command(int id) case IDM_SYSTRAYPOPUP_OPENFILE: { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); ::ShowWindow(_pPublicInterface->getHSelf(), nppGUI._isMaximized?SW_MAXIMIZE:SW_SHOW); _dockingManager.showFloatingContainers(true); restoreMinimizeDialogs(); diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp index b07fe57bb..5a130b894 100644 --- a/PowerEditor/src/NppIO.cpp +++ b/PowerEditor/src/NppIO.cpp @@ -1651,15 +1651,15 @@ bool Notepad_plus::fileSaveAs(BufferID id, bool isSaveCopy) // Disable file autodetection before opening save dialog to prevent use-after-delete bug. NppParameters& nppParam = NppParameters::getInstance(); auto cdBefore = nppParam.getNppGUI()._fileAutoDetection; - (const_cast(nppParam.getNppGUI()))._fileAutoDetection = cdDisabled; + (nppParam.getNppGUI())._fileAutoDetection = cdDisabled; generic_string fn = fDlg.doSaveDlg(); // Remember the selected state - const_cast(nppParam.getNppGUI())._setSaveDlgExtFiltToAllTypes = !fDlg.getFileTypeCheckboxValue(); + (nppParam.getNppGUI())._setSaveDlgExtFiltToAllTypes = !fDlg.getFileTypeCheckboxValue(); // Enable file autodetection again. - (const_cast(nppParam.getNppGUI()))._fileAutoDetection = cdBefore; + (nppParam.getNppGUI())._fileAutoDetection = cdBefore; if (!fn.empty()) { diff --git a/PowerEditor/src/NppNotification.cpp b/PowerEditor/src/NppNotification.cpp index d3ed8de69..d2a8559a7 100644 --- a/PowerEditor/src/NppNotification.cpp +++ b/PowerEditor/src/NppNotification.cpp @@ -839,7 +839,7 @@ BOOL Notepad_plus::notify(SCNotification *notification) return FALSE; NppParameters& nppParam = NppParameters::getInstance(); - NppGUI & nppGui = const_cast(nppParam.getNppGUI()); + NppGUI & nppGui = nppParam.getNppGUI(); // replacement for obsolete custom SCN_SCROLLED if (notification->updated & SC_UPDATE_V_SCROLL) diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index 8b0b325f0..84bab3d44 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -1351,7 +1351,7 @@ public: bool _isTaskListRBUTTONUP_Active = false; int L_END; - const NppGUI & getNppGUI() const { + NppGUI & getNppGUI() { return _nppGUI; } diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp index 888a1aace..782d6512b 100644 --- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp @@ -304,7 +304,7 @@ void FindReplaceDlg::create(int dialogID, bool isRTL, bool msgDestParent) enableDlgTheme(_hSelf, ETDT_ENABLETAB); NppParameters& nppParam = NppParameters::getInstance(); - NppGUI& nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI& nppGUI = nppParam.getNppGUI(); if (nppGUI._findWindowPos.bottom - nppGUI._findWindowPos.top != 0) // check height against 0 as a test of valid data from config { RECT rc = getViewablePositionRect(nppGUI._findWindowPos); @@ -2492,7 +2492,7 @@ void FindReplaceDlg::findAllIn(InWhat op) _pFinder->_scintView.execute(SCI_SETTABWIDTH, 4); NppParameters& nppParam = NppParameters::getInstance(); - NppGUI& nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI& nppGUI = nppParam.getNppGUI(); _pFinder->_longLinesAreWrapped = nppGUI._finderLinesAreCurrentlyWrapped; _pFinder->_scintView.wrap(_pFinder->_longLinesAreWrapped); _pFinder->_scintView.setWrapMode(LINEWRAP_INDENT); @@ -3912,7 +3912,7 @@ void Finder::wrapLongLinesToggle() { // only remember this setting from the original finder NppParameters& nppParam = NppParameters::getInstance(); - NppGUI& nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI& nppGUI = nppParam.getNppGUI(); nppGUI._finderLinesAreCurrentlyWrapped = _longLinesAreWrapped; } } @@ -3925,7 +3925,7 @@ void Finder::purgeToggle() { // only remember this setting from the original finder NppParameters& nppParam = NppParameters::getInstance(); - NppGUI& nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI& nppGUI = nppParam.getNppGUI(); nppGUI._finderPurgeBeforeEverySearch = _purgeBeforeEverySearch; } } diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 92fecd15b..61605735f 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -490,14 +490,14 @@ INT_PTR CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) case IDC_CHECK_TAB_LAST_EXIT: { - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); nppGUI._tabStatus ^= TAB_QUITONEMPTY; } return TRUE; case IDC_CHECK_TAB_ALTICONS: { - NppGUI& nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI& nppGUI = nppParam.getNppGUI(); nppGUI._tabStatus ^= TAB_ALTICONS; bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_TAB_ALTICONS, BM_GETCHECK, 0, 0)); ::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_CHANGETABBAEICONS, 0, isChecked ? 1 : 0); @@ -638,7 +638,7 @@ static LRESULT CALLBACK editNumSpaceProc(HWND hwnd, UINT message, WPARAM wParam, INT_PTR CALLBACK EditingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) { NppParameters& nppParam = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); switch (message) { case WM_INITDIALOG : @@ -987,7 +987,7 @@ const size_t fileUpdateChoiceDisable = 2; INT_PTR CALLBACK MiscSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); switch (message) { case WM_INITDIALOG : @@ -1652,7 +1652,7 @@ INT_PTR CALLBACK RecentFilesHistorySubDlg::run_dlgProc(UINT message, WPARAM wPar INT_PTR CALLBACK LanguageSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) { NppParameters& nppParam = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); NativeLangSpeaker *pNativeSpeaker = nppParam.getNativeLangSpeaker(); switch (message) @@ -2524,7 +2524,7 @@ INT_PTR CALLBACK PrintSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) INT_PTR CALLBACK BackupSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); switch (message) { case WM_INITDIALOG : @@ -2718,7 +2718,7 @@ void BackupSubDlg::updateBackupGUI() INT_PTR CALLBACK AutoCompletionSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParam = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParam.getNppGUI()); + NppGUI & nppGUI = nppParam.getNppGUI(); switch (message) { case WM_INITDIALOG : @@ -3018,7 +3018,7 @@ INT_PTR CALLBACK AutoCompletionSubDlg::run_dlgProc(UINT message, WPARAM wParam, INT_PTR CALLBACK MultiInstanceSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); switch (message) { case WM_INITDIALOG : @@ -3164,7 +3164,7 @@ generic_string DelimiterSubDlg::getWarningText(size_t nbSp, size_t nbTab) const void DelimiterSubDlg::setWarningIfNeed() const { generic_string msg; - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); if (!nppGUI._isWordCharDefault) { int nbSp = 0; @@ -3177,7 +3177,7 @@ void DelimiterSubDlg::setWarningIfNeed() const INT_PTR CALLBACK DelimiterSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) { - NppGUI & nppGUI = const_cast((NppParameters::getInstance()).getNppGUI()); + NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); switch (message) { case WM_INITDIALOG : @@ -3351,7 +3351,7 @@ INT_PTR CALLBACK DelimiterSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA INT_PTR CALLBACK CloudAndLinkSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParams = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParams.getNppGUI()); + NppGUI & nppGUI = nppParams.getNppGUI(); const size_t uriSchemesMaxLength = 2048; if (HIWORD(wParam) == EN_CHANGE) @@ -3527,7 +3527,7 @@ INT_PTR CALLBACK CloudAndLinkSubDlg::run_dlgProc(UINT message, WPARAM wParam, LP INT_PTR CALLBACK SearchEngineSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParams = NppParameters::getInstance(); - NppGUI & nppGUI = const_cast(nppParams.getNppGUI()); + NppGUI & nppGUI = nppParams.getNppGUI(); if (HIWORD(wParam) == EN_CHANGE) { @@ -3624,7 +3624,7 @@ INT_PTR CALLBACK SearchEngineSubDlg::run_dlgProc(UINT message, WPARAM wParam, LP INT_PTR CALLBACK SearchingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) { NppParameters& nppParams = NppParameters::getInstance(); - NppGUI& nppGUI = const_cast(nppParams.getNppGUI()); + NppGUI& nppGUI = nppParams.getNppGUI(); switch (message) { diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index ee7ac7530..4881058df 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -491,7 +491,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, PWSTR pCmdLine, int) } nppParameters.load(); - NppGUI & nppGui = const_cast(nppParameters.getNppGUI()); + NppGUI & nppGui = nppParameters.getNppGUI(); bool doUpdateNpp = nppGui._autoUpdateOpt._doAutoUpdate; bool doUpdatePluginList = nppGui._autoUpdateOpt._doAutoUpdate;