diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index f9291d433..332b18586 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2014,7 +2014,7 @@ void Notepad_plus::filePrint(bool showDialog) intptr_t startPos = _pEditView->execute(SCI_GETSELECTIONSTART); intptr_t endPos = _pEditView->execute(SCI_GETSELECTIONEND); - printer.init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf(), _pEditView, showDialog, int(startPos), int(endPos), _nativeLangSpeaker.isRTL()); + printer.init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf(), _pEditView, showDialog, startPos, endPos, _nativeLangSpeaker.isRTL()); printer.doPrint(); } diff --git a/PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp b/PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp index 0ec91deea..b6029d6b8 100644 --- a/PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp +++ b/PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp @@ -388,7 +388,7 @@ void FunctionCallTip::showCalltip() psize = _overloads.at(i).size()+1; if (_currentParam < psize) { - _currentOverload = static_cast(i); + _currentOverload = i; break; } } diff --git a/PowerEditor/src/ScintillaComponent/Printer.cpp b/PowerEditor/src/ScintillaComponent/Printer.cpp index 61b3399a0..a3a9b61bf 100644 --- a/PowerEditor/src/ScintillaComponent/Printer.cpp +++ b/PowerEditor/src/ScintillaComponent/Printer.cpp @@ -27,7 +27,7 @@ void replaceStr(generic_string & str, generic_string str2BeReplaced, generic_str str.replace(pos, str2BeReplaced.length(), replacement); } -void Printer::init(HINSTANCE hInst, HWND hwnd, ScintillaEditView *pSEView, bool showDialog, int startPos, int endPos, bool isRTL) +void Printer::init(HINSTANCE hInst, HWND hwnd, ScintillaEditView *pSEView, bool showDialog, size_t startPos, size_t endPos, bool isRTL) { _pSEView = pSEView; _startPos = startPos; diff --git a/PowerEditor/src/ScintillaComponent/Printer.h b/PowerEditor/src/ScintillaComponent/Printer.h index f176042db..9a1d87446 100644 --- a/PowerEditor/src/ScintillaComponent/Printer.h +++ b/PowerEditor/src/ScintillaComponent/Printer.h @@ -33,7 +33,7 @@ class Printer public : Printer() = default; - void init(HINSTANCE hInst, HWND hwnd, ScintillaEditView *pSEView, bool showDialog, int startPos, int endPos, bool isRTL = false); + void init(HINSTANCE hInst, HWND hwnd, ScintillaEditView *pSEView, bool showDialog, size_t startPos, size_t endPos, bool isRTL = false); size_t doPrint() { if (!::PrintDlg(&_pdlg)) return 0; diff --git a/PowerEditor/src/ScintillaComponent/columnEditor.cpp b/PowerEditor/src/ScintillaComponent/columnEditor.cpp index 0324860a5..67728c6ba 100644 --- a/PowerEditor/src/ScintillaComponent/columnEditor.cpp +++ b/PowerEditor/src/ScintillaComponent/columnEditor.cpp @@ -170,7 +170,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR s2r.insert(posRelative2Start, str); } - (*_ppEditView)->replaceTarget(s2r.c_str(), int(lineBegin), int(lineEnd)); + (*_ppEditView)->replaceTarget(s2r.c_str(), lineBegin, lineEnd); } delete [] line; } diff --git a/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp b/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp index d3f9f74cc..abfa5b8e5 100644 --- a/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp +++ b/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp @@ -270,7 +270,7 @@ void DocumentMap::scrollMapWith(const MapPosition & mapPos) } else { - higherY = _pMapView->execute(SCI_POINTYFROMPOSITION, 0, static_cast(mapPos._higherPos)); + higherY = _pMapView->execute(SCI_POINTYFROMPOSITION, 0, mapPos._higherPos); auto lineHeight = _pMapView->execute(SCI_TEXTHEIGHT, mapPos._firstVisibleDocLine); lowerY = mapPos._nbLine * lineHeight + higherY; } diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp index bff330b0b..0832aaf86 100644 --- a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp +++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp @@ -79,7 +79,7 @@ size_t FunctionListPanel::getBodyClosePos(size_t begin, const TCHAR *bodyOpenSym size_t docLen = (*_ppEditView)->getCurrentDocLen(); - if (begin >= (size_t)docLen) + if (begin >= docLen) return docLen; generic_string exprToSearch = TEXT("("); diff --git a/PowerEditor/src/WinControls/FunctionList/functionParser.cpp b/PowerEditor/src/WinControls/FunctionList/functionParser.cpp index 4abd647e9..1f44f67e3 100644 --- a/PowerEditor/src/WinControls/FunctionList/functionParser.cpp +++ b/PowerEditor/src/WinControls/FunctionList/functionParser.cpp @@ -661,7 +661,7 @@ void FunctionParser::getInvertZones(vector< pair > & destZones, else { // check the begin - if (int(begin) < sourceZones[0].first) + if (begin < sourceZones[0].first) { destZones.push_back(pair(begin, sourceZones[0].first - 1)); }