Fixed warnings.

2 files changed, 14 insertions, 14 deletions

diff --git a/src/LexCSS.cxx b/src/LexCSS.cxx
index fcf39a5c1..c5e5b2ffa 100644
--- a/src/LexCSS.cxx
+++ b/src/LexCSS.cxx
@@ -69,10 +69,10 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo
 			sc.Forward();
 			sc.ForwardSetState(lastStateC);
 		}
-		
+
 		if (sc.state == SCE_CSS_COMMENT)
 			continue;
-		
+
 		if (sc.state == SCE_CSS_OPERATOR) {
 			if (op == ' ') {
 				unsigned int i = startPos;
@@ -101,7 +101,7 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo
 			case ':':
 				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID)
 					sc.SetState(SCE_CSS_PSEUDOCLASS);
-				else if (lastState == SCE_CSS_IDENTIFIER || SCE_CSS_UNKNOWN_IDENTIFIER)
+				else if (lastState == SCE_CSS_IDENTIFIER || lastState == SCE_CSS_UNKNOWN_IDENTIFIER)
 					sc.SetState(SCE_CSS_VALUE);
 				break;
 			case '.':
@@ -128,13 +128,13 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo
 				break;
 			}
 		}
-		
+
 		if (IsAWordChar(sc.ch)) {
 			if (sc.state == SCE_CSS_DEFAULT)
 				sc.SetState(SCE_CSS_TAG);
 			continue;
 		}
-		
+
 		if (IsAWordChar(sc.chPrev) && (sc.state == SCE_CSS_IDENTIFIER || sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_IMPORTANT)) {
 			char s[100];
 			sc.GetCurrentLowered(s, sizeof(s));
@@ -156,18 +156,18 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo
 				break;
 			}
 		}
-		
+
 		if (sc.ch != '.' && sc.ch != ':' && sc.ch != '#' && (sc.state == SCE_CSS_CLASS || sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS || sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS || sc.state == SCE_CSS_ID))
 			sc.SetState(SCE_CSS_TAG);
-		
+
 		if (sc.Match('/', '*')) {
 			lastStateC = sc.state;
 			sc.SetState(SCE_CSS_COMMENT);
 			sc.Forward();
 			continue;
 		}
-		
-		if (IsCssOperator(sc.ch)
+
+		if (IsCssOperator(static_cast<char>(sc.ch))
 		&& (sc.state != SCE_CSS_VALUE || sc.ch == ';' || sc.ch == '}' || sc.ch == '!')
 		&& (sc.state != SCE_CSS_DIRECTIVE || sc.ch == ';' || sc.ch == '{')
 		) {
@@ -177,7 +177,7 @@ static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, Wo
 			op = sc.ch;
 		}
 	}
-	
+
 	sc.Complete();
 }
 
diff --git a/src/LexHTML.cxx b/src/LexHTML.cxx
index 687e2c533..ff93d5961 100644
--- a/src/LexHTML.cxx
+++ b/src/LexHTML.cxx
@@ -1790,7 +1790,7 @@ static void ColourisePHPPiece(StyleContext &sc, WordList *keywordlists[]) {
 
 	// Handle some PHP script
 	if (sc.state == SCE_HPHP_WORD) {
-		if (!IsPhpWordChar(sc.ch)) {
+		if (!IsPhpWordChar(static_cast<char>(sc.ch))) {
 			sc.SetState(SCE_HPHP_DEFAULT);
 		}
 	} else if (sc.state == SCE_HPHP_COMMENTLINE) {
@@ -1812,7 +1812,7 @@ static void ColourisePHPPiece(StyleContext &sc, WordList *keywordlists[]) {
 			sc.ForwardSetState(SCE_HPHP_DEFAULT);
 		}
 	} else if (sc.state == SCE_HPHP_VARIABLE) {
-		if (!IsPhpWordChar(sc.ch)) {
+		if (!IsPhpWordChar(static_cast<char>(sc.ch))) {
 			sc.SetState(SCE_HPHP_DEFAULT);
 		}
 	} else if (sc.state == SCE_HPHP_OPERATOR) {
@@ -1832,7 +1832,7 @@ static void ColourisePHPPiece(StyleContext &sc, WordList *keywordlists[]) {
 		}
 	}
 	if (sc.state == SCE_HPHP_DEFAULT) {
-		if (IsPhpWordStart(sc.ch)) {
+		if (IsPhpWordStart(static_cast<char>(sc.ch))) {
 			sc.SetState(SCE_HPHP_WORD);
 		} else if (sc.ch == '#') {
 			sc.SetState(SCE_HPHP_COMMENTLINE);
@@ -1846,7 +1846,7 @@ static void ColourisePHPPiece(StyleContext &sc, WordList *keywordlists[]) {
 			sc.SetState(SCE_HPHP_HSTRING);
 		} else if (sc.ch == '\'') {
 			sc.SetState(SCE_HPHP_SIMPLESTRING);
-		} else if (sc.ch == '$' && IsPhpWordStart(sc.chNext)) {
+		} else if (sc.ch == '$' && IsPhpWordStart(static_cast<char>(sc.chNext))) {
 			sc.SetState(SCE_HPHP_VARIABLE);
 		} else if (isoperator(static_cast<char>(sc.ch))) {
 			sc.SetState(SCE_HPHP_OPERATOR);