1 files changed, 11 insertions, 11 deletions

diff --git a/src/EditView.cxx b/src/EditView.cxx
index c1722a047..b3b107cff 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -286,7 +286,7 @@ static void DrawTabArrow(Surface *surface, PRectangle rcTab, int ymid,
 	}
 
 	// Draw the arrow head if needed
-	if (vsDraw.tabDrawMode == tdLongArrow) {
+	if (vsDraw.tabDrawMode == TabDrawMode::longArrow) {
 		XYPOSITION ydiff = std::floor(rcTab.Height() / 2.0f);
 		XYPOSITION xhead = rightStroke - ydiff;
 		if (xhead <= rcTab.left) {
@@ -1720,7 +1720,7 @@ void EditView::DrawBackground(Surface *surface, const EditModel &model, const Vi
 			} else {
 				// Normal text display
 				surface->FillRectangleAligned(rcSegment, Fill(textBack));
-				if (vsDraw.viewWhitespace != wsInvisible) {
+				if (vsDraw.viewWhitespace != WhiteSpace::invisible) {
 					for (int cpos = 0; cpos <= i - ts.start; cpos++) {
 						if (ll->chars[cpos + ts.start] == ' ') {
 							if (drawWhitespaceBackground && vsDraw.WhiteSpaceVisible(inIndentation)) {
@@ -1961,7 +1961,7 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi
 							textBack = vsDraw.whitespaceColours.back;
 						surface->FillRectangleAligned(rcSegment, Fill(textBack));
 					}
-					if (inIndentation && vsDraw.viewIndentationGuides == ivReal) {
+					if (inIndentation && vsDraw.viewIndentationGuides == IndentView::real) {
 						for (int indentCount = static_cast<int>((ll->positions[i] + epsilon) / indentWidth);
 							indentCount <= (ll->positions[i + 1] - epsilon) / indentWidth;
 							indentCount++) {
@@ -1972,7 +1972,7 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi
 							}
 						}
 					}
-					if (vsDraw.viewWhitespace != wsInvisible) {
+					if (vsDraw.viewWhitespace != WhiteSpace::invisible) {
 						if (vsDraw.WhiteSpaceVisible(inIndentation)) {
 							if (vsDraw.whitespaceColours.fore.isSet)
 								textFore = vsDraw.whitespaceColours.fore;
@@ -2013,11 +2013,11 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi
 							rcSegment.top + vsDraw.maxAscent, text, textFore, textBack);
 					}
 				}
-				if (vsDraw.viewWhitespace != wsInvisible ||
-					(inIndentation && vsDraw.viewIndentationGuides != ivNone)) {
+				if (vsDraw.viewWhitespace != WhiteSpace::invisible ||
+					(inIndentation && vsDraw.viewIndentationGuides != IndentView::none)) {
 					for (int cpos = 0; cpos <= i - ts.start; cpos++) {
 						if (ll->chars[cpos + ts.start] == ' ') {
-							if (vsDraw.viewWhitespace != wsInvisible) {
+							if (vsDraw.viewWhitespace != WhiteSpace::invisible) {
 								if (vsDraw.whitespaceColours.fore.isSet)
 									textFore = vsDraw.whitespaceColours.fore;
 								if (vsDraw.WhiteSpaceVisible(inIndentation)) {
@@ -2039,7 +2039,7 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi
 									surface->FillRectangleAligned(rcDot, Fill(textFore));
 								}
 							}
-							if (inIndentation && vsDraw.viewIndentationGuides == ivReal) {
+							if (inIndentation && vsDraw.viewIndentationGuides == IndentView::real) {
 								for (int indentCount = static_cast<int>((ll->positions[cpos + ts.start] + epsilon) / indentWidth);
 									indentCount <= (ll->positions[cpos + ts.start + 1] - epsilon) / indentWidth;
 									indentCount++) {
@@ -2078,7 +2078,7 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi
 
 void EditView::DrawIndentGuidesOverEmpty(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
 	Sci::Line line, Sci::Line lineVisible, PRectangle rcLine, int xStart, int subLine) {
-	if ((vsDraw.viewIndentationGuides == ivLookForward || vsDraw.viewIndentationGuides == ivLookBoth)
+	if ((vsDraw.viewIndentationGuides == IndentView::lookForward || vsDraw.viewIndentationGuides == IndentView::lookBoth)
 		&& (subLine == 0)) {
 		const Sci::Position posLineStart = model.pdoc->LineStart(line);
 		int indentSpace = model.pdoc->GetLineIndentation(line);
@@ -2099,7 +2099,7 @@ void EditView::DrawIndentGuidesOverEmpty(Surface *surface, const EditModel &mode
 				// Level is one more level than parent
 				indentLastWithText += model.pdoc->IndentSize();
 			}
-			if (vsDraw.viewIndentationGuides == ivLookForward) {
+			if (vsDraw.viewIndentationGuides == IndentView::lookForward) {
 				// In viLookForward mode, previous line only used if it is a fold header
 				if (isFoldHeader) {
 					indentSpace = std::max(indentSpace, indentLastWithText);
@@ -2502,7 +2502,7 @@ Sci::Position EditView::FormatRange(bool draw, const Sci_RangeToFormat *pfr, Sur
 	vsPrint.zoomLevel = printParameters.magnification;
 	// Don't show indentation guides
 	// If this ever gets changed, cached pixmap would need to be recreated if technology != SC_TECHNOLOGY_DEFAULT
-	vsPrint.viewIndentationGuides = ivNone;
+	vsPrint.viewIndentationGuides = IndentView::none;
 	// Don't show the selection when printing
 	vsPrint.selColours.back.isSet = false;
 	vsPrint.selColours.fore.isSet = false;