diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-04-25 15:16:49 +1000 | 
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-04-25 15:16:49 +1000 | 
| commit | df48b6485e268fb3781867728d37c0b1df948d28 (patch) | |
| tree | a80d19d983d34ae1ae54876fd6b4df6e0bbfe7c6 /src/Editor.cxx | |
| parent | cd0e7d81d111bfc38626f58859681a0b0cea160f (diff) | |
| download | scintilla-mirror-df48b6485e268fb3781867728d37c0b1df948d28.tar.gz | |
Remove casts that are not needed since sptr_t and Sci::Position are the same type.
Diffstat (limited to 'src/Editor.cxx')
| -rw-r--r-- | src/Editor.cxx | 58 | 
1 files changed, 29 insertions, 29 deletions
| diff --git a/src/Editor.cxx b/src/Editor.cxx index 848241941..29dcc9dbd 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -5695,27 +5695,27 @@ void Editor::SetSelectionNMessage(unsigned int iMessage, uptr_t wParam, sptr_t l  	switch (iMessage) {  	case SCI_SETSELECTIONNCARET: -		sel.Range(wParam).caret.SetPosition(static_cast<Sci::Position>(lParam)); +		sel.Range(wParam).caret.SetPosition(lParam);  		break;  	case SCI_SETSELECTIONNANCHOR: -		sel.Range(wParam).anchor.SetPosition(static_cast<Sci::Position>(lParam)); +		sel.Range(wParam).anchor.SetPosition(lParam);  		break;  	case SCI_SETSELECTIONNCARETVIRTUALSPACE: -		sel.Range(wParam).caret.SetVirtualSpace(static_cast<Sci::Position>(lParam)); +		sel.Range(wParam).caret.SetVirtualSpace(lParam);  		break;  	case SCI_SETSELECTIONNANCHORVIRTUALSPACE: -		sel.Range(wParam).anchor.SetVirtualSpace(static_cast<Sci::Position>(lParam)); +		sel.Range(wParam).anchor.SetVirtualSpace(lParam);  		break;  	case SCI_SETSELECTIONNSTART: -		sel.Range(wParam).anchor.SetPosition(static_cast<Sci::Position>(lParam)); +		sel.Range(wParam).anchor.SetPosition(lParam);  		break;  	case SCI_SETSELECTIONNEND: -		sel.Range(wParam).caret.SetPosition(static_cast<Sci::Position>(lParam)); +		sel.Range(wParam).caret.SetPosition(lParam);  		break;  	} @@ -5809,7 +5809,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		break;  	case SCI_COPYRANGE: -		CopyRangeToClipboard(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam)); +		CopyRangeToClipboard(static_cast<Sci::Position>(wParam), lParam);  		break;  	case SCI_COPYTEXT: @@ -5876,7 +5876,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_SETSEL: {  			Sci::Position nStart = static_cast<Sci::Position>(wParam); -			Sci::Position nEnd = static_cast<Sci::Position>(lParam); +			Sci::Position nEnd = lParam;  			if (nEnd < 0)  				nEnd = pdoc->Length();  			if (nStart < 0) @@ -5960,7 +5960,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_SETTARGETRANGE:  		targetStart = static_cast<Sci::Position>(wParam); -		targetEnd = static_cast<Sci::Position>(lParam); +		targetEnd = lParam;  		break;  	case SCI_TARGETWHOLEDOCUMENT: @@ -6013,7 +6013,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_POSITIONRELATIVE:  		return std::clamp(pdoc->GetRelativePosition( -			static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam)), +			static_cast<Sci::Position>(wParam), lParam),  			static_cast<Sci::Position>(0), pdoc->Length());  	case SCI_LINESCROLL: @@ -6053,7 +6053,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		if (lParam < 0) {  			return 0;  		} else { -			const Point pt = LocationFromPosition(static_cast<Sci::Position>(lParam)); +			const Point pt = LocationFromPosition(lParam);  			// Convert to view-relative  			return static_cast<int>(pt.x) - vs.textStart + vs.fixedColumnWidth;  		} @@ -6062,7 +6062,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		if (lParam < 0) {  			return 0;  		} else { -			const Point pt = LocationFromPosition(static_cast<Sci::Position>(lParam)); +			const Point pt = LocationFromPosition(lParam);  			return static_cast<int>(pt.y);  		} @@ -6155,7 +6155,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		return 0;  	case SCI_DELETERANGE: -		pdoc->DeleteChars(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam)); +		pdoc->DeleteChars(static_cast<Sci::Position>(wParam), lParam);  		return 0;  	case SCI_CLEARDOCUMENTSTYLE: @@ -6528,7 +6528,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		return pdoc->useTabs;  	case SCI_SETLINEINDENTATION: -		pdoc->SetLineIndentation(static_cast<Sci::Line>(wParam), static_cast<Sci::Position>(lParam)); +		pdoc->SetLineIndentation(static_cast<Sci::Line>(wParam), lParam);  		break;  	case SCI_GETLINEINDENTATION: @@ -6566,7 +6566,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		return pdoc->ExtendWordSelect(static_cast<Sci::Position>(wParam), 1, lParam != 0);  	case SCI_ISRANGEWORD: -		return pdoc->IsWordAt(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam)); +		return pdoc->IsWordAt(static_cast<Sci::Position>(wParam), lParam);  	case SCI_SETIDLESTYLING:  		idleStyling = static_cast<int>(wParam); @@ -6705,7 +6705,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		return pdoc->GetColumn(static_cast<Sci::Position>(wParam));  	case SCI_FINDCOLUMN: -		return pdoc->FindColumn(static_cast<Sci::Line>(wParam), static_cast<Sci::Position>(lParam)); +		return pdoc->FindColumn(static_cast<Sci::Line>(wParam), lParam);  	case SCI_SETHSCROLLBAR :  		if (horizontalScrollBarVisible != (wParam != 0)) { @@ -7175,7 +7175,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		break;  	case SCI_SCROLLRANGE: -		ScrollRange(SelectionRange(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam))); +		ScrollRange(SelectionRange(static_cast<Sci::Position>(wParam), lParam));  		break;  	case SCI_SEARCHANCHOR: @@ -7385,25 +7385,25 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_INDICATORFILLRANGE:  		pdoc->DecorationFillRange(static_cast<Sci::Position>(wParam), -			pdoc->decorations->GetCurrentValue(), static_cast<Sci::Position>(lParam)); +			pdoc->decorations->GetCurrentValue(), lParam);  		break;  	case SCI_INDICATORCLEARRANGE:  		pdoc->DecorationFillRange(static_cast<Sci::Position>(wParam), 0, -			static_cast<Sci::Position>(lParam)); +			lParam);  		break;  	case SCI_INDICATORALLONFOR:  		return pdoc->decorations->AllOnFor(static_cast<Sci::Position>(wParam));  	case SCI_INDICATORVALUEAT: -		return pdoc->decorations->ValueAt(static_cast<int>(wParam), static_cast<Sci::Position>(lParam)); +		return pdoc->decorations->ValueAt(static_cast<int>(wParam), lParam);  	case SCI_INDICATORSTART: -		return pdoc->decorations->Start(static_cast<int>(wParam), static_cast<Sci::Position>(lParam)); +		return pdoc->decorations->Start(static_cast<int>(wParam), lParam);  	case SCI_INDICATOREND: -		return pdoc->decorations->End(static_cast<int>(wParam), static_cast<Sci::Position>(lParam)); +		return pdoc->decorations->End(static_cast<int>(wParam), lParam);  	case SCI_LINEDOWN:  	case SCI_LINEDOWNEXTEND: @@ -7501,7 +7501,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		return KeyCommand(iMessage);  	case SCI_BRACEHIGHLIGHT: -		SetBraceHighlight(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam), STYLE_BRACELIGHT); +		SetBraceHighlight(static_cast<Sci::Position>(wParam), lParam, STYLE_BRACELIGHT);  		break;  	case SCI_BRACEHIGHLIGHTINDICATOR: @@ -7525,7 +7525,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_BRACEMATCH:  		// wParam is position of char to find brace for,  		// lParam is maximum amount of text to restyle to find it -		return pdoc->BraceMatch(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam)); +		return pdoc->BraceMatch(static_cast<Sci::Position>(wParam), lParam);  	case SCI_GETVIEWEOL:  		return vs.viewEOL; @@ -7834,7 +7834,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_GETRANGEPOINTER:  		return reinterpret_cast<sptr_t>(pdoc->RangePointer( -			static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam))); +			static_cast<Sci::Position>(wParam), lParam));  	case SCI_GETGAPPOSITION:  		return pdoc->GapPosition(); @@ -8020,12 +8020,12 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		break;  	case SCI_SETSELECTION: -		sel.SetSelection(SelectionRange(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam))); +		sel.SetSelection(SelectionRange(static_cast<Sci::Position>(wParam), lParam));  		Redraw();  		break;  	case SCI_ADDSELECTION: -		sel.AddSelection(SelectionRange(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam))); +		sel.AddSelection(SelectionRange(static_cast<Sci::Position>(wParam), lParam));  		ContainerNeedsUpdate(SC_UPDATE_SELECTION);  		Redraw();  		break; @@ -8172,7 +8172,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		break;  	case SCI_CHANGELEXERSTATE: -		pdoc->ChangeLexerState(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam)); +		pdoc->ChangeLexerState(static_cast<Sci::Position>(wParam), lParam);  		break;  	case SCI_SETIDENTIFIER: @@ -8190,7 +8190,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		return technology;  	case SCI_COUNTCHARACTERS: -		return pdoc->CountCharacters(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam)); +		return pdoc->CountCharacters(static_cast<Sci::Position>(wParam), lParam);  	default:  		return DefWndProc(iMessage, wParam, lParam); | 
